- Umbenennung für erneuten Bestellbestätigungsversand in Bestellung

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

3 files changed, 7 insertions, 5 deletions

diff --git a/views/css/admin.css b/views/css/admin.css
index f83f2bb..22566be 100644
--- a/views/css/admin.css
+++ b/views/css/admin.css
@@ -207,6 +207,7 @@ table.wpsgitrecht_table { width:100%; }
 

 #wpsg-bs.wpsg_order_view .editableform textarea { height:150px;}

 .wpsg_order_view .wpsg_cell_gesamtpreis { text-align:right; }

+.wpsg_order_view .wpsg_admin_submenu .glyphicon { float:left; height:30px; width:20px;}

 

 /* Modulverwaltung */

 .wpsg_admin_submenu .list-group-item.modul_akt { color:#3c763d; font-weight:bold; }

diff --git a/views/css/back.css b/views/css/back.css
index 7d590c4..968eb63 100644
--- a/views/css/back.css
+++ b/views/css/back.css
@@ -116,6 +116,7 @@
 .wpsg_admin_topmenu li.current a { background-image: url("../gfx/tab_top.gif"); background-repeat: no-repeat; background-position: top center; }

 .wpsg_admin_topmenu li a:hover { }

 .wpsg_admin_submenu { float:left; width:200px; }

+.wpsg_admin_submenu .glyphicon { float:left; height:30px; width:20px;}

 .wpsg_admin_submenu .head { cursor:pointer; margin-left:0px; width:180px; line-height:18px;   border-style: solid solid none; border-top-left-radius: 6px; border-top-right-radius: 6px; border-width: 1px 1px 0; border-color:#AAAAAA; color: #21759B; cursor:pointer !important; background-color:#F1F1F1; }

 .wpsg_admin_submenu .title { float:left; padding:5px; padding-left:12px; }

 .wpsg_admin_submenu .toggle { clear: right; cursor: default; float: right; height:26px; margin: 1px 0 0; padding: 1px 2px 0 0; width: 22px; cursor:pointer !important; }

diff --git a/views/order/view.phtml b/views/order/view.phtml
index f660eb9..bd6bc12 100644
--- a/views/order/view.phtml
+++ b/views/order/view.phtml
@@ -38,7 +38,7 @@
         </div>

 

 		<?php if(true) {?>

-        <a href="" id="LinkProduktNeu" onclick="return WPSG_BE_Product.addProduct(<?php echo $_REQUEST['edit_id']; ?>, 0);"><span class="glyphicon glyphicon-plus"></span>&nbsp;

+        <a href="" id="LinkProduktNeu" onclick="return WPSG_BE_Product.addProduct(<?php echo $_REQUEST['edit_id']; ?>, 0);"><span class="glyphicon glyphicon-plus"></span>

 	 	<?php echo __("Neues Produkt", "wpsg"); ?>

 	 	</a><br />

 	 	<?php } ?>

@@ -46,7 +46,7 @@
         <br />

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

         	<?php if (((array_key_exists('gs', $this->view['basket'])) && ($this->view['basket']['gs']['value'] == 0))) { ?>

-		        <a href="" id="LinkGutscheinNeu" onclick="return wpsg_addVoucher(<?php echo $_REQUEST['edit_id']; ?>);"><span class="glyphicon glyphicon-plus"></span>&nbsp;

+		        <a href="" id="LinkGutscheinNeu" onclick="return wpsg_addVoucher(<?php echo $_REQUEST['edit_id']; ?>);"><span class="glyphicon glyphicon-plus"></span>

 			 	<?php echo __("Neuer Gutschein", "wpsg"); ?>

 			 	</a><br />

             <?php } ?>

@@ -54,14 +54,14 @@
 

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

         	<?php //if (((array_key_exists('preis_rabatt', $this->view['basket']['sum'])) && ($this->view['basket']['sum']['preis_rabatt'] == 0))) { ?>

-		        <a href="" id="LinkRabattNeu" onclick="return wpsg_addDiscount(<?php echo $_REQUEST['edit_id']; ?>);"><span class="glyphicon glyphicon-plus"></span>&nbsp;

+		        <a href="" id="LinkRabattNeu" onclick="return wpsg_addDiscount(<?php echo $_REQUEST['edit_id']; ?>);"><span class="glyphicon glyphicon-plus"></span>

 			 	<?php echo __("Neuer Rabatt", "wpsg"); ?>

 			 	</a><br />

             <?php //} ?>

         <?php } ?>

 

-        <a href="" id="LinkSendMail" onclick="return wpsg_sendMail(<?php echo $_REQUEST['edit_id']; ?>);"><span class="glyphicon glyphicon-envelope"></span>&nbsp;

-	 	<?php echo __("Mail an Kunde", "wpsg"); ?>

+        <a href="" id="LinkSendMail" onclick="return wpsg_sendMail(<?php echo $_REQUEST['edit_id']; ?>);"><span class="glyphicon glyphicon-envelope"></span>

+	 	<?php echo __("Bestellbestätigung", "wpsg"); ?><br /><?php echo __("erneut versenden", "wpsg"); ?>

 	 	</a><br />

 

 		<div id='wpsg_kv_list'>