Changeset 2800:92f82976773e

Timestamp:

11/18/14 20:44:25 (11 years ago)

Author:

franck <carnet.franck.paul@…>

Branch:

default

Message:

Add a jQuery js library selector in blog pref, closes #1897

Files:

• admin/blog_pref.php (modified) (3 diffs)
• inc/core/class.dc.blog.php (modified) (1 diff)
• inc/js/jquery/1.11.1/jquery.cookie.js (added)
• inc/js/jquery/1.11.1/jquery.js (added)
• inc/js/jquery/1.4.2/jquery.cookie.js (added)
• inc/js/jquery/1.4.2/jquery.js (added)
• inc/load_plugin_file.php (modified) (1 diff)
• inc/prepend.php (modified) (1 diff)
• inc/public/class.dc.template.php (modified) (2 diffs)
• inc/public/default-templates/currywurst/_head.html (modified) (1 diff)
• inc/public/default-templates/mustek/_head.html (modified) (1 diff)
• locales/fr/main.po (modified) (1 diff)

admin/blog_pref.php

@@ -143 +143 @@
      'NOINDEX,NOFOLLOW,NOARCHIVE' => __("I would like to prevent search engines and archivers from indexing or archiving my blog's content."),
 );
+
+# jQuery available versions
+$jquery_root = dirname(__FILE__).'/../inc/js/jquery';
+$jquery_versions_combo = array(__('Default').' ('.DC_DEFAULT_JQUERY.')' => DC_DEFAULT_JQUERY);
+if (is_dir($jquery_root) && is_readable($jquery_root)) {
+     if (($d = @dir($jquery_root)) !== false) {
+          while (($entry = $d->read()) !== false) {
+               if ($entry != '.' && $entry != '..' && substr($entry, 0, 1) != '.' && is_dir($jquery_root.'/'.$entry)) {
+                    if ($entry != DC_DEFAULT_JQUERY) {
+                         $jquery_versions_combo[$entry] = $entry;
+                    }
+               }
+          }
+     }
+}
 
 # Update a blog
@@ -253 +268 @@
                $blog_settings->system->put('robots_policy',$_POST['robots_policy']);
           }
+          $blog_settings->system->put('jquery_version',$_POST['jquery_version']);
           $blog_settings->system->put('prevents_clickjacking',!empty($_POST['prevents_clickjacking']));
 
@@ -610 +626 @@
 
      echo
+     '<div class="fieldset"><h4>'.__('jQuery javascript library').'</h4>'.
+     '<p><label for="jquery_version" class="classic">'.__('jQuery version to be loaded for this blog:').'</label>'.' '.
+     form::combo('jquery_version',$jquery_versions_combo,$blog_settings->system->jquery_version).
+     '</p>'.
+     '<br class="clear" />'. //Opera sucks
+     '</div>';
+
+     echo
      '<div class="fieldset"><h4>'.__('Blog security').'</h4>'.
      '<p><label for="prevents_clickjacking" class="classic">'.

inc/core/class.dc.blog.php

@@ -118 +118 @@
 
           return $this->url;
+     }
+
+     /**
+     Reruens jQuery version selected for the blog.
+      */
+     public function getJsJQuery()
+     {
+          $version = $this->settings->system->jquery_version;
+          if ($version == '') {
+               $version = DC_DEFAULT_JQUERY; // defined in inc/prepend.php
+          }
+          return 'jquery/'.$version;
      }
 

inc/load_plugin_file.php

@@ -64 +64 @@
 $paths[] = dirname(__FILE__).'/swf';
 
+# Adding Js public folder and sub-folders
+$paths[] = dirname(__FILE__).'/js';
+
 foreach ($paths as $m)
 {

inc/prepend.php

@@ -147 +147 @@
 define('DC_DISTRIB_THEMES','berlin,blueSilence,blowupConfig,customCSS,default,ductile');
 define('DC_DEFAULT_TPLSET','mustek');
+define('DC_DEFAULT_JQUERY','1.4.2');
 
 if (!defined('DC_VENDOR_NAME')) {

inc/public/class.dc.template.php

@@ -75 +75 @@
           $this->addValue('BlogQmarkURL',array($this,'BlogQmarkURL'));
           $this->addValue('BlogMetaRobots',array($this,'BlogMetaRobots'));
+          $this->addValue('BlogJsJQuery',array($this,'BlogJsJQuery'));
 
           # Categories
@@ -878 +879 @@
      }
 
+     /*dtd
+     <!ELEMENT gpl:BlogJsJQuery - 0 -- Blog Js jQuery version selected -->
+     */
+     public function BlogJsJQuery($attr)
+     {
+          $f = $this->getFilters($attr);
+          return '<?php echo '.sprintf($f,'$core->blog->getJsJQuery()').'; ?>';
+     }
+
      /* Categories ----------------------------------------- */
 

inc/public/default-templates/currywurst/_head.html

@@ -11 +11 @@
 <link rel="stylesheet" type="text/css" href="{{tpl:BlogThemeURL}}/../default/print.css" media="print" />
 
-<script type="text/javascript" src="{{tpl:BlogThemeURL}}/../default/js/jquery.js"></script>
-<script type="text/javascript" src="{{tpl:BlogThemeURL}}/../default/js/jquery.cookie.js"></script>
+<script type="text/javascript" src="{{tpl:BlogQmarkURL}}pf={{tpl:BlogJsJQuery}}/jquery.js"></script>
+<script type="text/javascript" src="{{tpl:BlogQmarkURL}}pf={{tpl:BlogJsJQuery}}/jquery.cookie.js"></script>
 
 {{tpl:include src="user_head.html"}}

inc/public/default-templates/mustek/_head.html

@@ -2 +2 @@
 <link rel="stylesheet" type="text/css" href="{{tpl:BlogThemeURL}}/../default/print.css" media="print" />
 
-<script type="text/javascript" src="{{tpl:BlogThemeURL}}/../default/js/jquery.js"></script>
-<script type="text/javascript" src="{{tpl:BlogThemeURL}}/../default/js/jquery.cookie.js"></script>
+<script type="text/javascript" src="{{tpl:BlogQmarkURL}}pf={{tpl:BlogJsJQuery}}/jquery.js"></script>
+<script type="text/javascript" src="{{tpl:BlogQmarkURL}}pf={{tpl:BlogJsJQuery}}/jquery.cookie.js"></script>
 
 {{tpl:include src="user_head.html"}}

locales/fr/main.po

@@ -3685 +3685 @@
 msgstr "Ne pas afficher la date si elle est seule dans le titre"
 
+msgid "jQuery javascript library"
+msgstr "Librairie javascript jQuery"
+
+msgid "jQuery version to be loaded for this blog:"
+msgstr "Version de la librairie jQuery à charger pour ce blog :"
+
 #~ msgid "You don't have permissions to deactivate this plugin."
 #~ msgstr "Vous n'avez pas les permissions pour désactiver ce plugin."