- Text unter E-Mail nicht mehr im Dialog um Bootstrap/TinyMCE Problem zu umgehen / Task #611

- http://trac.wpshopgermany.de/ticket/611

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

2 files changed, 15 insertions, 32 deletions

diff --git a/views/admin/emailconf.phtml b/views/admin/emailconf.phtml
index 3e193ed..1df3f64 100644
--- a/views/admin/emailconf.phtml
+++ b/views/admin/emailconf.phtml
@@ -192,7 +192,8 @@
 			else jQuery(".col-logo-alignment").show()

 

 		});

-		if(jQuery("#wpsg_email_logo_watermark")[0].checked == true) jQuery(".col-logo-alignment").hide();

+		

+		if(jQuery("#wpsg_email_logo_watermark").first().checked == true) jQuery(".col-logo-alignment").hide();

 

 	} );

 

diff --git a/views/admin/form/emailconf.phtml b/views/admin/form/emailconf.phtml
index 9958b81..e89055d 100644
--- a/views/admin/form/emailconf.phtml
+++ b/views/admin/form/emailconf.phtml
@@ -23,38 +23,20 @@
 		

 	<?php } ?>

 

-	<div class="modal fade" tabindex="-1" role="dialog" id="modal<?php echo $this->view['field_key']; ?>">

-		<div class="modal-dialog">

-			<div class="modal-content">

-				<div class="modal-header">

-					<button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">&times;</span></button>

-					<h4 class="modal-title"><?php echo __('Text im Footer der Mail bearbeiten', 'wpsg'); ?></h4>

-				</div>

-				<div class="modal-body">

+    <br /><p style="font-weight:700;"><?php echo (__('Text unter der E-Mail', 'wpsg')); ?></p>

+

+    <?php

+    

+    // RTE

+    ob_start();

+    wp_editor($this->get_option('wpsg_'.$this->view['field_key'].'_text'), 'wpsg_'.$this->view['field_key'].'_text');

+    $rte_content = ob_get_contents();

+    ob_end_clean();

+    

+    echo $rte_content;

+    

+    ?>

 

-					<?php

-

-						// RTE

-						ob_start();

-						wp_editor($this->get_option('wpsg_'.$this->view['field_key'].'_text'), 'wpsg_'.$this->view['field_key'].'_text');

-						$rte_content = ob_get_contents();

-						ob_end_clean();

-

-						echo $rte_content;

-

-					?>

-

-				</div>

-				<div class="modal-footer">

-					<button type="button" class="btn btn-default" data-dismiss="modal"><?php echo __('Schließen', 'wpsg'); ?></button>

-				</div>

-			</div><!-- /.modal-content -->

-		</div><!-- /.modal-dialog -->

-	</div><!-- /.modal -->

-

-	<?php echo wpsg_drawForm_TextStart(); ?>

-	<a href="#" data-toggle="modal" data-target="#modal<?php echo $this->view['field_key']; ?>"><?php echo __('Text anzeigen/bearbeiten', 'wpsg'); ?></a>

-	<?php echo wpsg_drawForm_TextEnd(__('Text unter der E-Mail', 'wpsg')); ?>

 	<br />

 	<?php echo __('* Der restliche E-Mailtext kann nur im Mailtemplate verändert werden', 'wpsg'); ?>	

 	<?php if (wpsg_isSizedString($notice)) { ?>