- Sicherung

git-svn-id: https://[internal]/wordpress/plugins/wpsg4@5264 0d5edaf7-2b12-4e95-93f4-047927463d4b

4 files changed, 73 insertions, 58 deletions

diff --git a/views/admin/form/input.phtml b/views/admin/form/input.phtml
new file mode 100644
index 0000000..a2abe45
--- /dev/null
+++ b/views/admin/form/input.phtml
@@ -0,0 +1,9 @@
+<div class="form-group">

+

+	<label class="col-sm-6 control-label" for="<?php echo $this->view['field_id']; ?>"><?php echo $this->view['field_label']; ?></label>

+	

+	<div class="col-sm-6">

+		<input type="text" class="form-control" value="<?php echo wpsg_hspc($this->view['field_value']); ?>" id="<?php echo $this->view['field_id']; ?>" />

+	</div>

+	

+</div>
\ No newline at end of file
diff --git a/views/admin/form/text.phtml b/views/admin/form/text.phtml
new file mode 100644
index 0000000..49554c5
--- /dev/null
+++ b/views/admin/form/text.phtml
@@ -0,0 +1,9 @@
+<div class="form-group">

+

+	<label class="control-label col-sm-6" for=""><?php echo $this->view['field_label']; ?></label>

+	

+	<div class="col-sm-6">

+		<p class="form-control-static"><?php echo wpsg_hspc($this->view['field_value']); ?></p>

+	</div>

+	

+</div>
\ No newline at end of file
diff --git a/views/admin/index.phtml b/views/admin/index.phtml
index b6594ec..2000e28 100644
--- a/views/admin/index.phtml
+++ b/views/admin/index.phtml
@@ -7,33 +7,39 @@
 

 ?>

 

-<div class="wpsg_admin">

+<div class="wpsg_admin" id="wpsg-bs">

 

-	<div class="wrap">

-		<h2><?php echo __('wpShopGermany', 'wpsg'); ?></h2>

- 	</div>

+	<nav class="navbar navbar-default navbar-admin">

+		<div class="container-fluid">

+			<div class="navbar-header">

+				<a class="navbar-brand" href="#"><?php echo __('wpShopGermany', 'wpsg'); ?></a>

+			</div>

+			<div class="collapse navbar-collapse" id="bs-example-navbar-collapse-1">

+				<ul class="nav navbar-nav">

+			 		<li role="presentation" class="<?php echo (($this->view['actionName'] == "index")?'active':''); ?>"><a href="<?php echo WPSG_URL_WP; ?>wp-admin/admin.php?page=wpsg-Admin"><?php echo __("Einstellungen", "wpsg"); ?></a></li>

+					<li role="presentation" class="<?php echo (($this->view['actionName'] == "module")?'active':''); ?>"><a href="<?php echo WPSG_URL_WP; ?>wp-admin/admin.php?page=wpsg-Admin&amp;action=module"><?php echo __("Module", "wpsg"); ?></a></li>

+						

+					<?php if (current_user_can('wpsg_lizence') && $this->hasMod('wpsg_mod_core')) { ?>			

+					<li role="presentation" class="<?php echo (($this->view['actionName'] == "registrierung")?'active':''); ?>"><a href="<?php echo WPSG_URL_WP; ?>wp-admin/admin.php?page=wpsg-Admin&amp;action=registrierung"><?php echo __("Lizenzverwaltung", "wpsg"); ?></a></li>

+					<?php } ?>

+					

+					<li role="presentation" class="<?php echo (($this->view['actionName'] == 'news')?'active':''); ?>"><a href="<?php echo WPSG_URL_WP; ?>wp-admin/admin.php?page=wpsg-Admin&action=news">

+						<?php echo __('Aktuelles', 'wpsg'); ?>

+						<?php if (wpsg_isSizedInt($wpsg_news_unread = wpsg_news::countUnreadNews())) { ?>

+						<span class="badge" style="background-color:#D9534F;">4</span>

+						<?php } ?>			

+					</a></li>

+				</ul>

+				<ul class="nav navbar-nav navbar-right">				

+					<li role="presentation" class="<?php echo (($this->view['actionName'] == "hilfe")?'active':''); ?>"><a href="<?php echo WPSG_URL_WP; ?>wp-admin/admin.php?page=wpsg-Admin&amp;action=hilfe"><?php echo __("Hilfe", "wpsg"); ?></a></li>

+					<li role="presentation" class="<?php echo (($this->view['actionName'] == "ueber")?'active':''); ?>"><a href="<?php echo WPSG_URL_WP; ?>wp-admin/admin.php?page=wpsg-Admin&amp;action=ueber"><?php echo __("Über", "wpsg"); ?></a></li>

+			 	</ul>

+			</div>

+		</div>

+	</nav> 

 	

 	<?php echo $this->writeBackendMessage(); ?>

-			

-	<div class="wpsg_admin_topmenu">

-		<ul>

-			<li class="<?php echo (($this->view['actionName'] == "index")?'current':''); ?>"><a href="<?php echo WPSG_URL_WP; ?>wp-admin/admin.php?page=wpsg-Admin"><?php echo __("Einstellungen", "wpsg"); ?></a></li>

-			<li class="<?php echo (($this->view['actionName'] == "module")?'current':''); ?>"><a href="<?php echo WPSG_URL_WP; ?>wp-admin/admin.php?page=wpsg-Admin&amp;action=module"><?php echo __("Module", "wpsg"); ?></a></li>

-			<?php if (current_user_can('wpsg_lizence') && $this->hasMod('wpsg_mod_core')) { ?>			

-			<li class="<?php echo (($this->view['actionName'] == "registrierung")?'current':''); ?>"><a href="<?php echo WPSG_URL_WP; ?>wp-admin/admin.php?page=wpsg-Admin&amp;action=registrierung"><?php echo __("Lizenzverwaltung", "wpsg"); ?></a></li>

-			<?php } ?>

-			<li class="<?php echo (($this->view['actionName'] == 'news')?'current':''); ?>"><a href="<?php echo WPSG_URL_WP; ?>wp-admin/admin.php?page=wpsg-Admin&action=news">

-				<?php echo __('Aktuelles', 'wpsg'); ?>

-				<?php if (wpsg_isSizedInt($wpsg_news_unread = wpsg_news::countUnreadNews())) { ?>

-				<span class="wpsg_news_unreadhint"><?php echo $wpsg_news_unread; ?></span>

-				<?php } ?>			

-			</a></li>

-			<li class="<?php echo (($this->view['actionName'] == "hilfe")?'current':''); ?>"><a href="<?php echo WPSG_URL_WP; ?>wp-admin/admin.php?page=wpsg-Admin&amp;action=hilfe"><?php echo __("Hilfe", "wpsg"); ?></a></li>

-			<li class="<?php echo (($this->view['actionName'] == "ueber")?'current':''); ?>"><a href="<?php echo WPSG_URL_WP; ?>wp-admin/admin.php?page=wpsg-Admin&amp;action=ueber"><?php echo __("Über", "wpsg"); ?></a></li>

-		</ul>

-	</div>

-	<div style="clear:both;"></div>

-	

+			  	

 	<div class="wpsg_admin_wrap">

 		<?php if (wpsg_isSizedString($this->view['subTemplate'])) { ?>

 		<?php $this->render($this->view['subTemplate']); ?>

diff --git a/views/admin/konfiguration.phtml b/views/admin/konfiguration.phtml
index a93cd79..bb9579f 100644
--- a/views/admin/konfiguration.phtml
+++ b/views/admin/konfiguration.phtml
@@ -6,24 +6,21 @@
 

 ?>

 <div class="wpsg_admin_submenu">

-	

-	<div class="head">

-		<div class="title"><?php echo __("Einstellungen", "wpsg"); ?></div>			

-		<div style="clear:both;"></div>

-	</div>

-

-	<ul>		

-		<?php foreach ($this->view['arSubAction'] as $k => $v) { ?>		

-		<li class="<?php echo (($k == $this->view['subAction'])?'current':''); ?>"><a href="<?php echo WPSG_URL_WP; ?>wp-admin/admin.php?page=wpsg-Admin&amp;subaction=<?php echo $k; ?>"><?php echo $v['Menutext']; ?></a></li>

+	 

+	<div class="list-group">

+		<span class="list-group-head list-group-item">asdasd</span>	

+		<?php foreach ($this->view['arSubAction'] as $k => $v) { ?>		 

+		<a class="list-group-item <?php echo (($k == $this->view['subAction'])?'active':''); ?>" href="<?php echo WPSG_URL_WP; ?>wp-admin/admin.php?page=wpsg-Admin&amp;subaction=<?php echo $k; ?>"><?php echo $v['Menutext']; ?></a>		

 		<?php } ?>

-	</ul>

+	</div>

 			

 </div>

 		

-<div style="padding:0px; margin:0px; float:left;">

+<div class="wpsg_admin_content form-horizontal">

 	<form name="form1" method="post" enctype="multipart/form-data" action="<?php echo wpsg_hspc(WPSG_URL_WP.'wp-admin/admin.php?page=wpsg-Admin&subaction=konfiguration&noheader=1'); ?>">

   

   		<?php if ($this->hasMod('wpsg_mod_core')) { ?>

+  		

 			<?php if ($this->arLizenz['l'] == 0) { ?>

 			<div class="wpsg_form_field">

 				<div class="wpsg_form_left">

@@ -40,29 +37,23 @@
 				<div class="wpsg_clear"></div>

 			</div>		

 			<?php } else { ?>

-			<div class="wpsg_form_field">

-				<div class="wpsg_form_left">

-					<?php echo __('Lizenzstatus', 'wpsg'); ?>:

-				</div>

-				<div class="wpsg_form_right">

-					<p>

-					<?php 

-					

-						switch ($this->arLizenz['l']) 

-						{ 

-					

-							case '1': echo __('Light Version', 'wpsg'); break;

-							case '2': echo __('Pro Version', 'wpsg'); break;

-							case '3': echo __('Enterprise Version', 'wpsg'); break;

-							default: die();

-							

-						}					

-	 

-					?>				

-					</p>

-				</div>

-				<div class="wpsg_clear"></div>

-			</div>

+			

+			<?php 

+			

+				$strText = '';

+				switch ($this->arLizenz['l'])

+				{

+						

+					case '1': $strText = __('Light Version', 'wpsg'); break;

+					case '2': $strText = __('Pro Version', 'wpsg'); break;

+					case '3': $strText = __('Enterprise Version', 'wpsg'); break;

+					default: die();

+						

+				}

+				

+				echo wpsg_drawForm_Text(__('Lizenzstatus', 'wpsg'), $strText);

+			

+			?>

 			<?php } ?>

 		<?php } else { ?> 

 		<div class="wpsg_form_field">