Changeset 1011:c8f32ed1ca5c for themes

Timestamp:

11/14/12 19:27:33 (13 years ago)

Author:

franck <carnet.franck.paul@…>

Branch:

default

Parents:

1004:1c1f8b410a12 (diff), 1009:867afbf9f1be (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Remerge default branche and lasts commits

Files:

• themes/ductile/_config.php (modified) (1 diff)
• themes/ductile/_config.php (modified) (1 diff)

themes/ductile/_config.php

@@ -429 +429 @@
      echo '<p>'.sprintf(__('To configure the top menu go to the <a href="%s">Simple Menu administration page</a>.'),'plugin.php?p=simpleMenu').'</p>';
 }
-echo '<p class="field"><label for"logo_src">'.__('Logo URL:').' '.
+echo '<p class="field"><label for="logo_src">'.__('Logo URL:').' '.
      form::field('logo_src',40,255,$ductile_user['logo_src']).'</label>'.'</p>';
 echo '</fieldset>';

themes/ductile/_config.php

@@ -405 +405 @@
           $core->emptyTemplatesCache();
           
-          echo
-          '<div class="message"><p>'.
-          __('Theme configuration upgraded.').
-          '</p></div>';
+          dcPage::message(__('Theme configuration upgraded.'),true,true);
      }
      catch (Exception $e)