Changeset 2663:8dd9be9b33c1

Timestamp:

02/14/14 22:05:36 (11 years ago)

Author:

franck <carnet.franck.paul@…>

Branch:

default

Message:

Add reset button in theme editor (available only on template file and if there is a model, from parent or from template set), addresses #1703

Files:

• locales/fr/plugins.po (modified) (1 diff)
• plugins/themeEditor/_define.php (modified) (1 diff)
• plugins/themeEditor/class.themeEditor.php (modified) (3 diffs)
• plugins/themeEditor/index.php (modified) (3 diffs)
• plugins/themeEditor/script.js (modified) (2 diffs)

locales/fr/plugins.po

@@ -1992 +1992 @@
 msgstr "Du jeu de template :"
 
+msgid "Reset"
+msgstr "Réinitialiser"
+
+msgid "Are you sure you want to reset this file?"
+msgstr "Êtes-vous sûr de vouloir réinitialiser ce fichier ?"
+
+msgid "The file has been reset."
+msgstr "Le fichier a été réinitialisé."
+
 #~ msgid "RSS or Atom feed subscription links"
 #~ msgstr "Liens d'abonnement aux flux RSS ou Atom"

plugins/themeEditor/_define.php

@@ -16 +16 @@
      /* Description*/         "Theme Editor",
      /* Author */             "Olivier Meunier",
-     /* Version */            '1.0',
+     /* Version */            '1.1',
      array(
           'type'         =>        'plugin'

plugins/themeEditor/class.themeEditor.php

@@ -158 +158 @@
      }
 
+     public function deletableFile($type,$f)
+     {
+          if ($type != 'tpl') {
+               // Only tpl files may be deleted
+               return false;
+          }
+
+          $files = $this->getFilesFromType($type);
+          if (isset($files[$f])) {
+               $dest = $this->getDestinationFile($type,$f);
+               if ($dest) {
+                    if (file_exists($dest) && is_writable($dest)) {
+                         // Is there a model (parent theme or template set) ?
+                         if (isset($this->tpl_model[$f])) {
+                              return true;
+                         }
+                    }
+               }
+          }
+          return false;
+     }
+
+     public function deleteFile($type,$f)
+     {
+          if ($type != 'tpl') {
+               // Only tpl files may be deleted
+               return;
+          }
+
+          $files = $this->getFilesFromType($type);
+          if (!isset($files[$f])) {
+               throw new Exception(__('File does not exist.'));
+          }
+
+          try
+          {
+               $dest = $this->getDestinationFile($type,$f);
+               if ($dest) {
+                    // File exists and may be deleted
+                    unlink($dest);
+
+                    // Updating template files list
+                    $this->findTemplates();
+               }
+          }
+          catch (Exception $e)
+          {
+               throw new Exception(sprintf(__('Unable to delete file %s. Please check your theme files and folders permissions.'),$f));
+          }
+     }
+
      protected function getDestinationFile($type,$f)
      {
@@ -235 +286 @@
           $this->tpl = array_merge(
                $this->getFilesInDir($this->tplset_theme),
-               $this->getFilesInDir($this->parent_theme.'/tpl'),
-               $this->getFilesInDir($this->user_theme.'/tpl')
+               $this->getFilesInDir($this->parent_theme.'/tpl')
                );
+          $this->tpl_model = $this->tpl;
+
+          $this->tpl = array_merge($this->tpl,$this->getFilesInDir($this->user_theme.'/tpl'));
 
           # Then we look in 'default-templates' plugins directory
@@ -243 +296 @@
           foreach ($plugins as $p) {
                $this->tpl = array_merge($this->getFilesInDir($p['root'].'/default-templates'),$this->tpl);
+               $this->tpl_model = array_merge($this->getFilesInDir($p['root'].'/default-templates'),$this->tpl_model);
           }
 

plugins/themeEditor/index.php

@@ -52 +52 @@
           $o->writeFile($file['type'],$file['f'],$file['c']);
      }
+
+     # Delete file
+     if (!empty($_POST['delete']))
+     {
+          $o->deleteFile($file['type'],$file['f']);
+          dcPage::addSuccessNotice(__('The file has been deleted.'));
+          http::redirect($p_url.'&'.$file['type'].'='.$file['f']);
+     }
 }
 catch (Exception $e)
@@ -68 +76 @@
   <?php echo dcPage::jsVar('dotclear.msg.document_saved',__("Document saved")); ?>
   <?php echo dcPage::jsVar('dotclear.msg.error_occurred',__("An error occurred:")); ?>
+  <?php echo dcPage::jsVar('dotclear.msg.confirm_reset_file',__("Are you sure you want to reset this file?")); ?>
   <?php echo dcPage::jsVar('dotclear.colorsyntax',$user_ui_colorsyntax); ?>
   //]]>
@@ -122 +131 @@
           echo
           '<p><input type="submit" name="write" value="'.__('Save').' (s)" accesskey="s" /> '.
+          ($o->deletableFile($file['type'],$file['f']) ? '<input type="submit" name="delete" class="delete" value="'.__('Reset').'" />' : '').
           $core->formNonce().
           ($file['type'] ? form::hidden(array($file['type']),$file['f']) : '').

plugins/themeEditor/script.js

@@ -1 +1 @@
 $(function() {
+     // Cope with saving
      var msg = false;
      $('#file-form input[name="write"]').click(function() {
@@ -31 +32 @@
           return false;
      });
+
+     // Confirm for deleting current file
+     $('#file-form input[name="delete"]').click(function() {
+          return window.confirm(dotclear.msg.confirm_reset_file);
+     });
+
 });