Changeset 2175:44a940977175 for plugins/maintenance/index.php

Timestamp:

09/30/13 21:16:20 (12 years ago)

Author:

Denis Jean-Chirstian <contact@…>

Branch:

dcRepo

Parents:

2174:6ed25e45a14e (diff), 2173:94520262a1b8 (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:

Merge from default

Files:

• plugins/maintenance/index.php (modified) (2 diffs)
• plugins/maintenance/index.php (modified) (3 diffs)

plugins/maintenance/index.php

@@ -27 +27 @@
 $code = empty($_POST['code']) ? null : (integer) $_POST['code'];
 $tab = empty($_REQUEST['tab']) ? '' : $_REQUEST['tab'];
-
-// Save settings
-
-if (!empty($_POST['settings'])) {
-
-     try {
-          $core->blog->settings->maintenance->put(
-               'plugin_message', 
-               !empty($_POST['settings_plugin_message']), 
-               'boolean', 
-               'Display alert message of late tasks on plugin page', 
-               true, 
-               true
-          );
-
-          foreach($tasks as $t) {
-               if (!empty($_POST['settings_recall_type']) && $_POST['settings_recall_type'] == 'all') {
-                    $ts = $_POST['settings_recall_time'];
-               }
-               else {
-                    $ts = empty($_POST['settings_ts_'.$t->id()]) ? 0 : $_POST['settings_ts_'.$t->id()];
-               }
-               $core->blog->settings->maintenance->put(
-                    'ts_'.$t->id(), 
-                    abs((integer) $ts), 
-                    'integer', 
-                    sprintf('Recall time for task %s', $t->id()), 
-                    true, 
-                    $t->blog()
-               );
-          }
-          
-          http::redirect($p_url.'&done=1&tab='.$tab.'#'.$tab);
-     }
-     catch(Exception $e) {
-          $core->error->add($e->getMessage());
-     }
-}
 
 // Get task object
@@ -287 +249 @@
           '</div>';
      }
-
-     // Settings
-
-     echo 
-     '<div id="settings" class="multi-part" title="'.__('Alert settings').'">'.
-     '<h3>'.__('Alert settings').'</h3>'.
-     '<form action="'.$p_url.'" method="post">'.
-
-     '<h4 class="pretty-title">'.__('Activation').'</h4>'.
-     '<p><label for="settings_plugin_message" class="classic">'.
-     form::checkbox('settings_plugin_message', 1, $core->blog->settings->maintenance->plugin_message).
-     __('Display alert messages on late tasks').'</label></p>'.
-
-     '<p class="info">'.sprintf(
-          __('You can place list of late tasks on your %s.'),
-          '<a href="preferences.php#user-favorites">'.__('Dashboard').'</a>'
-     ).'</p>'.
-
-     '<h4 class="pretty-title vertical-separator">'.__('Frequency').'</h4>'.
-
-     '<p class="vertical-separator">'.form::radio(array('settings_recall_type', 'settings_recall_all'), 'all').' '.
-     '<label class="classic" for="settings_recall_all">'.
-     '<strong>'.__('Use one recall time for all tasks').'</strong></label>'.
-
-     '<p class="field wide vertical-separator"><label for="settings_recall_time">'.__('Recall time for all tasks:').'</label>'.
-     form::combo('settings_recall_time', $combo_ts, 'seperate', 'recall-for-all').
-     '</p>'.
-
-     '<p class="vertical-separator">'.form::radio(array('settings_recall_type', 'settings_recall_separate'), 'separate', 1).' '.
-     '<label class="classic" for="settings_recall_separate">'.
-     '<strong>'.__('Use one recall time per task').'</strong></label>';
-
-     foreach($tasks as $t)
-     {
-          echo
-          '<div class="two-boxes">'.
-
-          '<p class="field wide"><label for="settings_ts_'.$t->id().'">'.$t->task().'</label>'.
-          form::combo('settings_ts_'.$t->id(), $combo_ts, $t->ts(), 'recall-per-task').
-          '</p>'.
-
-          '</div>';
-     }
-
-     echo 
-     '<p class="field wide"><input type="submit" value="'.__('Save this settings').'" /> '.
-     form::hidden(array('tab'), 'settings').
-     form::hidden(array('settings'), 1).
-     $core->formNonce().'</p>'.
-     '</form>'.
-     '</div>';
 }
 

plugins/maintenance/index.php

@@ -95 +95 @@
           array(
                __('Plugins') => '',
-               '<span class="page-title">'.__('Maintenance').'</span>' => ''
+               __('Maintenance') => ''
           )
      ).
@@ -121 +121 @@
                __('Plugins') => '',
                '<a href="'.$p_url.'">'.__('Maintenance').'</a>' => '',
-               '<span class="page-title">'.html::escapeHTML($task->name()).'</span>' => ''
+               html::escapeHTML($task->name())=> ''
           )
      );
@@ -155 +155 @@
           array(
                __('Plugins') => '',
-               '<span class="page-title">'.__('Maintenance').'</span>' => ''
+               __('Maintenance') => ''
           )
      );