Changeset 1089:049be1a46863 for admin

Timestamp:

12/19/12 11:57:54 (13 years ago)

Author:

JcDenis

Branch:

twig

Message:

• Better way to fill in complex page title
• Group all types of messages
• Fix aboutConfig form submit
• Clean up uggly tabs on inline doc

Location:

admin

Files:

• auth.php (modified) (3 diffs)
• index.php (modified) (1 diff)
• plugin.php (modified) (1 diff)
• post.php (modified) (2 diffs)

admin/auth.php

@@ -31 +31 @@
      try {
           if (($changes = dotclearUpgrade($core)) !== false) {
-               $_ctx->setMessage(__('Dotclear has been upgraded.').'<!-- '.$changes.' -->');
+               $_ctx->setAlert(__('Dotclear has been upgraded.').'<!-- '.$changes.' -->');
           }
      }
@@ -64 +64 @@
                
                mail::sendMail($recover_res['user_email'],$subject,$message,$headers);
-               $_ctx->setMessage(__('Your new password is in your mailbox.'));
+               $_ctx->setAlert(__('Your new password is in your mailbox.'));
           }
           catch (Exception $e) {
@@ -171 +171 @@
                
                mail::sendMail($user_email,$subject,$message,$headers);
-               $_ctx->setMessage(sprintf(__('The e-mail was sent successfully to %s.'),$user_email));
+               $_ctx->setAlert(sprintf(__('The e-mail was sent successfully to %s.'),$user_email));
           }
           catch (Exception $e) {

admin/index.php

@@ -306 +306 @@
 }
 
-$_ctx->setPageTitle(__('Dashboard'));
+$_ctx->fillPageTitle(__('Dashboard'));
 $core->tpl->display('index.html.twig');
 ?>

admin/plugin.php

@@ -90 +90 @@
 # No plugin or content found
 if (!$has_content) {
-     $_ctx->setPageTitle(__('Plugin not found'));
+     $_ctx->fillPageTitle(__('Plugin not found'));
      $_ctx->addError(__('The plugin you reached does not exist or does not have an admin page.'));
      $core->tpl->display('plugin.html.twig');

admin/post.php

@@ -17 +17 @@
 function savePost($form) {
      global $_ctx;
-     $_ctx->setMessage('save');
+     $_ctx->setAlert('save');
 
 }
@@ -180 +180 @@
      $default_tab = 'comments';
 }
-$_ctx->default_tab = $default_tab;
-$_ctx->setPageTitle($page_title);
+
+$_ctx
+     ->fillPageTitle(__('Entries'),'posts.php')
+     ->fillPageTitle($page_title)
+     ->default_tab = $default_tab;
 
 $core->tpl->display('post.html.twig');