Changeset 10385 for extensions/Mail_supervisor/admin

Timestamp:

Apr 15, 2011, 4:09:41 PM (13 years ago)

Author:

cljosse

Message:

[extensions] mail_supervisor fix bug format_email

Location:

extensions/Mail_supervisor/admin

Files:

• clear/theme.css (modified) (1 diff)
• default/theme.css (modified) (3 diffs)
• header_2_1.tpl (modified) (1 diff)
• header_2_2.tpl (modified) (1 diff)
• mail_superv_admin.php (modified) (4 diffs)
• roma/theme.css (modified) (3 diffs)

extensions/Mail_supervisor/admin/clear/theme.css

@@ -1 @@
-.Style1 {
-  color: #6699CC;
-}
-.items {
-  font-style: italic;
-}
-.row2 {
-  font-style: italic;
-  border: 0;
-}
-.row1 {
-  font-style: italic;
-  border: 0;
-}
-.info {
-  color: #5599FF;
-}
 .bug {
-  background-image: url(../smilies/mouche.gif);
+  background-image: url('../../smilies/mouche.gif');
   background-repeat: no-repeat;
   width: 100px;
   height: 75px;
-}
-.frame_ {
-  height: 40px;
-}
-
-.erreur {
-  color: #FF0000;
 }
 .instructions {

extensions/Mail_supervisor/admin/default/theme.css

@@ -1 @@
-/* Bloc expand-collapse instructions */
-.instructionBlock
-{
+.bug {
+  background-image: url('../../smilies/mouche.gif');
+  background-repeat: no-repeat;
+  width: 100px;
+  height: 75px;
+}
+/* Bloc expand-collapse instructions */
+.instructionBlock{
   border: 1px solid #666;
   margin: 5px;
   overflow: hidden;
 }
-
-.instructionBlockHeaderCollapsed, .instructionBlockHeaderExpanded
-{
+.instructionBlockHeaderCollapsed, .instructionBlockHeaderExpanded{
   background-color:#111;
   background-position:15px center;
@@ -19 +22 @@
   text-align: left;
 }
-
-.instructionBlockHeaderCollapsed span, .instructionBlockHeaderExpanded span
-{
+.instructionBlockHeaderCollapsed span, .instructionBlockHeaderExpanded span{
   border-bottom: none;
 }
@@ -31 +32 @@
  background-image: url('./clear/icon/collapse.gif'));
 }
-.instructionBlockContent
-{
+.instructionBlockContent{
   padding:0 15px 15px;
 }

extensions/Mail_supervisor/admin/header_2_1.tpl

@@ -1 @@
-{html_head}
-{known_script id="jquery" src= $ROOT_URL|@cat:$path_js|@cat:"jquery.packed.js" } 
-{known_script id="jquery.cluetip" src=$ROOT_URL|@cat:$path_js|@cat:"plugins/jquery.cluetip.packed.js" }
+{known_script id="jquery" src = $ROOT_URL|@cat:"themes/default/js/jquery.packed.js" now=0} 
+{known_script id="jquery.cluetip" src = $ROOT_URL|@cat:"themes/default/js/plugins/jquery.cluetip.packed.js"}
+{known_script id="jquery.ui" src= $ROOT_URL|@cat:"themes/default/js/ui/minified/ui.core.min.js"}
 {known_script id="mail_script" src= $MAIL_SUPERV_PATH|@cat:"include/Scripts.js"}
+{html_head}
 <link rel="stylesheet" type="text/css" href="{$MAIL_SUPERV_PATH}admin/{$theme}/theme.css" />
-
 {/html_head}
 <input id="action_spam" name="action_spam" type="hidden" value="{$action_spam}" />

extensions/Mail_supervisor/admin/header_2_2.tpl

@@ -1 @@
-{combine_script id="jquery" path= $ROOT_URL|@cat:$path_js|@cat:"jquery.min.js" }
-{combine_script id="jquery.cluetip" path=$ROOT_URL|@cat:$path_js|@cat:"plugins/jquery.cluetip.js" require="jquery"}
+{combine_script id="jquery" path= "themes/default/js/jquery.min.js" }
+{combine_script id="jquery.cluetip" path= "themes/default/js/plugins/jquery.cluetip.js" require="jquery"}
 {combine_script id="my_script" path= $MAIL_SUPERV_PATH|@cat:"include/Scripts.js" }
-
-<input id="action_spam" name="action_spam" type="hidden" value="{$action_spam}" />
+{if $theme=='default'}{combine_css path= $MAIL_SUPERV_PATH|@cat:'admin/clear/theme.css'}{/if}
 {if $theme=='clear'}{combine_css path= $MAIL_SUPERV_PATH|@cat:'admin/clear/theme.css'}{/if}
 {if $theme=='roma'}{combine_css path= $MAIL_SUPERV_PATH|@cat:'admin/roma/theme.css'}{/if}
-{if $theme=='default'}{combine_css path= $MAIL_SUPERV_PATH|@cat:'admin/clear/theme.css'}{/if}
+{html_head}
 
+{/html_head}

extensions/Mail_supervisor/admin/mail_superv_admin.php

@@ -358 +358 @@
   $template->assign(
                                         array(
-                                                'Groupe'     => $groups,
-                                        'message_test' => $mails_donnees['message_test'] ,
-                                                'liste' => $destinataires ,
-                                                'version' =>     $version ,
-                                                'MAIL_CONTENT' => $mails_donnees['message_test'],
-                                                'path_js' => $path_js,
-                        'MAIL_SUPERV_PATH_ABS' => MAIL_SUPERV_PATH_ABS,
-                        'MAIL_SUPERV_PATH' => MAIL_SUPERV_PATH ,
+              'Groupe'     => $groups,
+              'message_test' => $mails_donnees['message_test'] ,
+              'liste' => $destinataires ,
+              'version' =>       $version ,
+              'MAIL_CONTENT' => $mails_donnees['message_test'],
+              'path_js' => $path_js,
+              'MAIL_SUPERV_PATH_ABS' => MAIL_SUPERV_PATH_ABS,
+              'MAIL_SUPERV_PATH' => MAIL_SUPERV_PATH ,
                                                 )
                                 );      
@@ -433 +433 @@
         $champs_ip=array();
         $champs_bl=array();
-        if (!empty($liste_ip))          $champs_ip=array_keys($liste_ip[0]);
+        if (!empty($liste_ip))  $champs_ip=array_keys($liste_ip[0]);
         if (!empty($liste_bl))  $champs_bl=array_keys($liste_bl[0]);
            $smile_bonjour=MAIL_SUPERV_PATH."smilies/mouche.gif" ; 
@@ -467 +467 @@
                         'version' =>     $version ,
                         'MAIL_SUPERV_PATH_ABS' => MAIL_SUPERV_PATH_ABS,
-                                'path_js' => $path_js,
+                      
                                         )
                                 );                       
@@ -487 +487 @@
       $template->assign(
                                         array(
-                                        'smile_bonjour' => $smile_bonjour ,
-                                         'version' =>    $version ,
-                                         'MAIL_SUPERV_PATH' =>  MAIL_SUPERV_PATH ,
-                         'path_js' => $path_js,
-                        'MAIL_SUPERV_PATH_ABS' => MAIL_SUPERV_PATH_ABS
+              'smile_bonjour' => $smile_bonjour ,
+              'version' =>       $version ,
+              'MAIL_SUPERV_PATH' =>  MAIL_SUPERV_PATH ,
+              'path_js' => $path_js,
+              'MAIL_SUPERV_PATH_ABS' => MAIL_SUPERV_PATH_ABS
                                         )
                         );              

extensions/Mail_supervisor/admin/roma/theme.css

@@ -1 @@
-/* Bloc expand-collapse instructions */
-.instructionBlock
-{
+.bug {
+  background-image: url('../../smilies/mouche.gif');
+  background-repeat: no-repeat;
+  width: 100px;
+  height: 75px;
+}
+/* Bloc expand-collapse instructions */
+.instructionBlock{
   border: 1px solid #666;
   margin: 5px;
   overflow: hidden;
 }
-
-.instructionBlockHeaderCollapsed, .instructionBlockHeaderExpanded
-{
+.instructionBlockHeaderCollapsed, .instructionBlockHeaderExpanded{
   background-color:#111;
   background-position:15px center;
@@ -19 +22 @@
   text-align: left;
 }
-
-.instructionBlockHeaderCollapsed span, .instructionBlockHeaderExpanded span
-{
-  border-bottom: none;
+.instructionBlockHeaderCollapsed span, .instructionBlockHeaderExpanded span{  
+border-bottom: none;
 }
 
@@ -28 +29 @@
   background-image: url(expand.gif);
 }
-
-.instructionBlockHeaderExpanded
-{
+.instructionBlockHeaderExpanded{
   background-image: url(collapse.gif) ;
 }
 
-.instructionBlockContent
-{
+.instructionBlockContent{
   padding:0 15px 15px;
 }