liquid_cms 0.2.0.11 → 0.2.0.12

data/CHANGELOG.rdoc

@@ -1,5 +1,12 @@
 == 0.2.0.11
 
+* Enhancements
+  * Upgrade codemirror syntax highlighting to 0.94
+  * Remember component folders view state.
+  * Add tabs for each resource type.
+
+== 0.2.0.11
+
 * Fixes
   * Fix translation issue in forms.
 

data/TODO.rdoc

@@ -3,6 +3,6 @@
 * No functions are currently limited to specific user roles.  All CMS users can perform the same actions.
 * Implement caching and expiration logic.
 * Provide example apache/nginx/etc. conf files that properly scope cms assets for each context.
-* Generate CMS documentation from rdoc comments in source files.
+* Generate CMS documentation from rdoc comments in source files?
 * Search functions.  Find templates based on search text.
 * Missing tests... add more coverage.

data/app/controllers/cms/main_controller.rb

@@ -4,7 +4,7 @@ class Cms::MainController < Cms::SetupController
 
   layout 'cms'
 
-  before_filter :load_pages_and_assets
+  before_filter :load_resources
 
   authenticate_user :all, :only => %w(index)
 
@@ -13,10 +13,11 @@ class Cms::MainController < Cms::SetupController
   end
 
 protected
-  def load_pages_and_assets
+  def load_resources
     @context = Cms::Context.new(@cms_context)
 
     @pages = @context.pages.ordered.all(:conditions => {:layout_page_id => nil})
     @assets = @context.assets.ordered
+    @components = @context.components
   end
 end

data/app/helpers/cms/common_helper.rb

@@ -1,4 +1,12 @@
 module Cms::CommonHelper
+  # js cookie accessor
+  def cookie_jar(key)
+    # if the cookie hasn't been set, need to return '{}' to return a proper hash
+    # and if the cookie has been set, but is 'null', we need to then return a ruby hash
+    # __CJ_ is the cookiejar js lib postfix value for cookies
+    ActiveSupport::JSON.decode(cookies["__CJ_#{key}".to_sym] || '{}') || {}
+  end
+
   def cms_icon(name, options = {})
     image_tag "/cms/images/icons/#{name}", options.merge(:size => '16x16')
   end
@@ -94,7 +102,6 @@ module Cms::CommonHelper
   end
 
   def asset_preview_option
-    # __CJ_ is the cookiejar js lib postfix value for cookies
-    ActiveSupport::JSON.decode(cookies[:__CJ_toggle] || '{}')['on'] == false ? 'style="display:none"' : ''
+    cookie_jar('toggle')['on'] == false ? 'style="display:none"' : ''
   end
 end

data/app/helpers/cms/components_helper.rb

@@ -1,4 +1,8 @@
 module Cms::ComponentsHelper
+  def component_folder_open?(folder_id)
+    cookie_jar('component_folders')[folder_id].present?
+  end
+
   def component_edit_link(path)
     full_path = Cms::Component.component_path(@context, path)
     link_to(truncate(File.basename(path), :length => 15), {:controller => 'cms/components', :action => 'edit', :url => CGI::escape(full_path)})
@@ -9,15 +13,17 @@ module Cms::ComponentsHelper
     link_to(cms_icon('delete.png', :title => 'Delete'), {:controller => 'cms/components', :action => 'destroy', :url => CGI::escape(full_path)}, :confirm => "Are you sure you want to remove '#{full_path}'?")
   end
 
-  def list_files(path, hidden = false)
+  def list_files(files, hidden = false)
     html = ''
     html += hidden ? %[<ul class="tree" style="display:none">] : %[<ul class="tree">]
-    for file in Dir[File.expand_path(path)+"/*"] do
+    for file in files do
       html += "<li>"
       if File.directory?(file)
-        html += cms_icon('folder.png', :class => 'folder') + ' ' + component_delete_link(file) + ' '
+        folder_id = "folder_#{Digest::MD5.hexdigest(file)}"
+
+        html += cms_icon('folder.png', :class => 'folder', :id => folder_id) + ' ' + component_delete_link(file) + ' '
         html += content_tag(:span, File.basename(file), :title => Cms::Component.component_path(@context, file))
-        html += list_files(file, true)
+        html += list_files(Cms::Component.files(file), !component_folder_open?(folder_id))
       else
         html += file_type_icon(File.basename(file)) + ' '
         html += component_delete_link(file) + ' '

data/app/models/cms/component.rb

@@ -21,6 +21,10 @@ class Cms::Component
     path.sub(full_path(context).to_s + "/", '')
   end
 
+  def self.files(path)
+    Dir[File.expand_path(path) + "/*"]
+  end
+
   def self.valid_type?(file)
     %w(.css .js .png .jpg .jpeg .gif .json .xml .fla .ico).include?(File.extname(file).downcase)
   end

data/app/views/cms/assets/_list.html.erb

@@ -1,4 +1,8 @@
 <div id="assets">
+  <p>
+    <%= cms_icon 'picture_add.png' %> <%= link_to t('assets.actions.index.new_link'), new_cms_asset_path %>
+  </p>
+
   <% if @assets.empty? %>
     <p><%= t 'assets.actions.index.none' %></p>
   <% else %>
@@ -7,8 +11,4 @@
       <%= render :partial => 'cms/assets/asset', :collection => @assets %>
     </ul>
   <% end %>
-
-  <p>
-    <%= cms_icon 'picture_add.png' %> <%= link_to t('assets.actions.index.new_link'), new_cms_asset_path %>
-  </p>
 </div>

data/app/views/cms/components/_list.html.erb

@@ -4,5 +4,9 @@
     <%= submit_tag 'Upload' %> <em>.zip files only</em>
   <% end %>
 
-  <%= list_files Cms::Component.full_path(@context) %>
+  <% if @components.empty? %>
+    <p><%= t 'components.actions.index.none' %></p>
+  <% else %>
+    <%= list_files @components %>
+  <% end %>
 </div>

data/app/views/cms/pages/_list.html.erb

@@ -1,4 +1,8 @@
 <div id="pages">
+  <p>
+    <%= cms_icon 'page_add.png' %> <%= link_to t('pages.actions.index.new_link'), new_cms_page_path %>
+  </p>
+
   <% if @pages.empty? %>
     <p><%= t 'pages.actions.index.none' %></p>
   <% else %>
@@ -6,8 +10,4 @@
       <%= render :partial => 'cms/pages/page', :collection => @pages %>
     </ul>
   <% end %>
-
-  <p>
-    <%= cms_icon 'page_add.png' %> <%= link_to t('pages.actions.index.new_link'), new_cms_page_path %>
-  </p>
 </div>

data/app/views/cms/shared/_sidebar.html.erb

@@ -1,11 +1,35 @@
-<h2><%= t 'pages.actions.index.title' %></h2>
-<%= render 'cms/pages/list' %>
+<ul id="cms_menus" class="tabs clearfix">
+  <li><%= link_to t('pages.actions.index.title'), '#cms_pages' %></li>
+  <li><%= link_to t('assets.actions.index.title'), '#cms_assets' %></li>
+  <li><%= link_to t('components.actions.index.title'), '#cms_components' %></li>
+</ul>
 
-<h2><%= t 'assets.actions.index.title' %></h2>
-<%= render 'cms/assets/list' %>
+<div id="tab_container">
+  <div id="cms_pages">
+    <h2><%= t 'pages.actions.index.title' %></h2>
+    <%= render 'cms/pages/list' %>
+  </div>
 
-<h2><%= t 'components.actions.index.title' %></h2>
-<%= render 'cms/components/list' %>
+  <div id="cms_assets">
+    <h2><%= t 'assets.actions.index.title' %></h2>
+    <%= render 'cms/assets/list' %>
+  </div>
+
+  <div id="cms_components">
+    <h2><%= t 'components.actions.index.title' %></h2>
+    <%= render 'cms/components/list' %>
+  </div>
+</div>
+
+<% javascript_tag do %>
+  new Control.Tabs('cms_menus', {
+    defaultTab: jar.get('active_tab') || 'first',
+    afterChange: function(new_container) {
+      // save the active tab
+      jar.put('active_tab', new_container.getAttribute('id'));
+    }
+  });
+<% end %>
+
+<p class="documentation"><%= cms_icon 'page.png' %> <%= link_to 'Documentation', cms_documentation_path %></p>
 
-<hr style="border:1px solid #BBB" />
-<p style="text-align:right"><%= cms_icon 'page.png' %> <%= link_to 'Documentation', cms_documentation_path %></p>

data/app/views/layouts/cms.html.erb

@@ -5,15 +5,18 @@
   <meta http-equiv="content-type" content="text/html; charset=UTF-8"/>
   <title>Liquid CMS</title>
   <%= javascript_include_tag 'prototype', 'effects' %>
-  <%= javascript_include_tag '/cms/javascripts/humanmsg', '/cms/javascripts/cookiejar', '/cms/javascripts/cms' %>
+  <%= javascript_include_tag '/cms/javascripts/humanmsg', '/cms/javascripts/cookiejar', '/cms/javascripts/cms', '/cms/javascripts/livepipe', '/cms/javascripts/tabs', :cache => 'cms_scripts' %>
   <%= javascript_include_tag '/cms/codemirror/js/codemirror' %>
   <%= stylesheet_link_tag '/cms/stylesheets/simple_form' %>
-  <%= stylesheet_link_tag '/cms/stylesheets/clearfix', '/cms/stylesheets/humanmsg', '/cms/stylesheets/styles' %>
+  <%= stylesheet_link_tag '/cms/stylesheets/clearfix', '/cms/stylesheets/humanmsg', '/cms/stylesheets/styles', '/cms/stylesheets/sidebar', :cache => 'cms_styles' %>
   <%= stylesheet_link_tag '/cms/stylesheets/themes/dark' %>
   <%= yield :cms_styles %>
   <!--[if lte IE 8]>
   <%= stylesheet_link_tag '/cms/stylesheets/ie' %>
   <![endif]-->
+  <!--[if lte IE 9]>
+  <%= stylesheet_link_tag '/cms/stylesheets/ie9' %>
+  <![endif]-->
 </head>
 <body id="cms" class="cms_<%= params[:controller].camelize.demodulize.downcase %>">
   <div id="header">

data/generators/liquid_cms/templates/config/locales/cms/en.yml

@@ -2,7 +2,7 @@ en:
   pages:
     actions:
       index:
-        title: 'Site Pages'
+        title: 'Pages'
         none: 'There are currently no pages.'
         new_link: 'Create a new page'
       new:
@@ -17,7 +17,7 @@ en:
   assets:
     actions:
       index:
-        title: 'Site Assets'
+        title: 'Assets'
         none: 'There are currently no assets.'
         new_link: 'Upload a new asset'
       new:
@@ -33,6 +33,7 @@ en:
     actions:
       index:
         title: 'Components'
+        none: 'There are currently no components.'
 
   simple_form:
     "yes": 'Yes'

data/generators/liquid_cms/templates/public/cms/codemirror/css/docs.css

@@ -1,10 +1,13 @@
 body {
-  font-family: Droid Sans, Arial, sans-serif;
+  font-family: Arial, sans-serif;
   line-height: 1.5;
   max-width: 64.3em;
   margin: 3em auto;
   padding: 0 1em;
 }
+body.droid {
+  font-family: Droid Sans, Arial, sans-serif;
+}
 
 h1 {
   letter-spacing: -3px;
@@ -27,7 +30,7 @@ h3 {
 }
 
 pre {
-  font-family: Droid Sans Mono, Courier New, monospaced;
+  font-family: Courier New, monospaced;
   background-color: #eee;
   -moz-border-radius: 6px;
   -webkit-border-radius: 6px;
@@ -44,6 +47,13 @@ pre.code {
   padding: .5em 1em;
   line-height: 1.2em;
   margin-top: .5em;
+  position: relative;
+}
+
+img.logo {
+  position: absolute;
+  right: -25px;
+  bottom: 4px;
 }
 
 a:link, a:visited, .quasilink {
@@ -52,10 +62,14 @@ a:link, a:visited, .quasilink {
   text-decoration: none;
 }
 
-a:hover {
+a:hover, .quasilink:hover {
   color: #800004;
 }
 
+h1 a:link, h1 a:visited, h1 a:hover {
+  color: black;
+}
+
 ul {
   margin: 0;
   padding-left: 1.2em;

data/generators/liquid_cms/templates/public/cms/codemirror/css/font.js

@@ -0,0 +1,15 @@
+function waitForStyles() {
+  for (var i = 0; i < document.styleSheets.length; i++)
+    if (/googleapis/.test(document.styleSheets[i].href))
+      return document.body.className += " droid";
+  setTimeout(waitForStyles, 100);
+}
+setTimeout(function() {
+  if (/AppleWebKit/.test(navigator.userAgent) && /iP[oa]d|iPhone/.test(navigator.userAgent)) return;
+  var link = document.createElement("LINK");
+  link.type = "text/css";
+  link.rel = "stylesheet";
+  link.href = "http://fonts.googleapis.com/css?family=Droid+Sans|Droid+Sans:bold";
+  document.documentElement.getElementsByTagName("HEAD")[0].appendChild(link);
+  waitForStyles();
+}, 20);

data/generators/liquid_cms/templates/public/cms/codemirror/js/codemirror.js

@@ -21,6 +21,12 @@ var CodeMirror = (function(){
     for (var i = 0; i < array.length; i++)
       action(array[i]);
   }
+  function createHTMLElement(el) {
+    if (document.createElementNS && document.documentElement.namespaceURI !== null)
+      return document.createElementNS("http://www.w3.org/1999/xhtml", el)
+    else
+      return document.createElement(el)
+  }
 
   // These default options can be overridden by passing a set of
   // options to a specific CodeMirror constructor. See manual.html for
@@ -37,6 +43,7 @@ var CodeMirror = (function(){
     lineNumberTime: 50,
     continuousScanning: false,
     saveFunction: null,
+    onLoad: null,
     onChange: null,
     undoDepth: 50,
     undoDelay: 800,
@@ -47,22 +54,27 @@ var CodeMirror = (function(){
     height: "300px",
     minHeight: 100,
     autoMatchParens: false,
+    markParen: null,
+    unmarkParen: null,
     parserConfig: null,
     tabMode: "indent", // or "spaces", "default", "shift"
     enterMode: "indent", // or "keep", "flat"
     electricChars: true,
     reindentOnLoad: false,
     activeTokens: null,
-    cursorActivity: null,
+    onCursorActivity: null,
     lineNumbers: false,
     firstLineNumber: 1,
+    onLineNumberClick: null,
     indentUnit: 2,
-    domain: null
+    domain: null,
+    noScriptCaching: false,
+    incrementalLoading: false
   });
 
   function addLineNumberDiv(container, firstNum) {
-    var nums = document.createElement("DIV"),
-        scroller = document.createElement("DIV");
+    var nums = createHTMLElement("div"),
+        scroller = createHTMLElement("div");
     nums.style.position = "absolute";
     nums.style.height = "100%";
     if (nums.style.setExpression) {
@@ -87,18 +99,19 @@ var CodeMirror = (function(){
     if (typeof options.stylesheet == "string")
       options.stylesheet = [options.stylesheet];
 
-    var html = ["<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.0 Transitional//EN\" \"http://www.w3.org/TR/html4/loose.dtd\"><html><head>"];
+    var sp = " spellcheck=\"" + (options.disableSpellcheck ? "false" : "true") + "\"";
+    var html = ["<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.0 Transitional//EN\" \"http://www.w3.org/TR/html4/loose.dtd\"><html" + sp + "><head>"];
     // Hack to work around a bunch of IE8-specific problems.
     html.push("<meta http-equiv=\"X-UA-Compatible\" content=\"IE=EmulateIE7\"/>");
+    var queryStr = options.noScriptCaching ? "?nocache=" + new Date().getTime().toString(16) : "";
     forEach(options.stylesheet, function(file) {
-      html.push("<link rel=\"stylesheet\" type=\"text/css\" href=\"" + file + "\"/>");
+      html.push("<link rel=\"stylesheet\" type=\"text/css\" href=\"" + file + queryStr + "\"/>");
     });
     forEach(options.basefiles.concat(options.parserfile), function(file) {
       if (!/^https?:/.test(file)) file = options.path + file;
-      html.push("<script type=\"text/javascript\" src=\"" + file + "\"><" + "/script>");
+      html.push("<script type=\"text/javascript\" src=\"" + file + queryStr + "\"><" + "/script>");
     });
-    html.push("</head><body style=\"border-width: 0;\" class=\"editbox\" spellcheck=\"" +
-              (options.disableSpellcheck ? "false" : "true") + "\"></body></html>");
+    html.push("</head><body style=\"border-width: 0;\" class=\"editbox\"" + sp + "></body></html>");
     return html.join("");
   }
 
@@ -112,8 +125,9 @@ var CodeMirror = (function(){
     // Backward compatibility for deprecated options.
     if (options.dumbTabs) options.tabMode = "spaces";
     else if (options.normalTab) options.tabMode = "default";
+    if (options.cursorActivity) options.onCursorActivity = options.cursorActivity;
 
-    var frame = this.frame = document.createElement("IFRAME");
+    var frame = this.frame = createHTMLElement("iframe");
     if (options.iframeClass) frame.className = options.iframeClass;
     frame.frameBorder = 0;
     frame.style.border = "0";
@@ -123,17 +137,18 @@ var CodeMirror = (function(){
     // always add it, redundant as it sounds.
     frame.style.display = "block";
 
-    var div = this.wrapping = document.createElement("DIV");
+    var div = this.wrapping = createHTMLElement("div");
     div.style.position = "relative";
     div.className = "CodeMirror-wrapping";
     div.style.width = options.width;
     div.style.height = (options.height == "dynamic") ? options.minHeight + "px" : options.height;
     // This is used by Editor.reroutePasteEvent
-    var teHack = this.textareaHack = document.createElement("TEXTAREA");
+    var teHack = this.textareaHack = createHTMLElement("textarea");
     div.appendChild(teHack);
     teHack.style.position = "absolute";
     teHack.style.left = "-10000px";
     teHack.style.width = "10px";
+    teHack.tabIndex = 100000;
 
     // Link back to this object, so that the editor can fetch options
     // and add a reference to itself.
@@ -163,7 +178,9 @@ var CodeMirror = (function(){
 
   CodeMirror.prototype = {
     init: function() {
+      // Deprecated, but still supported.
       if (this.options.initCallback) this.options.initCallback(this);
+      if (this.options.onLoad) this.options.onLoad(this);
       if (this.options.lineNumbers) this.activateLineNumbers();
       if (this.options.reindentOnLoad) this.reindent();
       if (this.options.height == "dynamic") this.setDynamicHeight();
@@ -177,7 +194,8 @@ var CodeMirror = (function(){
 
     focusIfIE: function() {
       // in IE, a lot of selection-related functionality only works when the frame is focused
-      if (this.win.select.ie_selection) this.focus();
+      if (this.win.select.ie_selection && document.activeElement != this.frame)
+        this.focus();
     },
     focus: function() {
       this.win.focus();
@@ -257,12 +275,12 @@ var CodeMirror = (function(){
     setEnterMode: function(mode) {this.options.enterMode = mode;},
     setLineNumbers: function(on) {
       if (on && !this.lineNumbers) {
-        this.lineNumbers = addLineNumberDiv(this.wrapping);
+        this.lineNumbers = addLineNumberDiv(this.wrapping,this.options.firstLineNumber);
         this.activateLineNumbers();
       }
       else if (!on && this.lineNumbers) {
         this.wrapping.removeChild(this.lineNumbers);
-        this.wrapping.style.marginLeft = "";
+        this.wrapping.style.paddingLeft = "";
         this.lineNumbers = null;
       }
     },
@@ -312,6 +330,15 @@ var CodeMirror = (function(){
           nums = this.lineNumbers, scroller = nums.firstChild, self = this;
       var barWidth = null;
 
+      nums.onclick = function(e) {
+        var handler = self.options.onLineNumberClick;
+        if (handler) {
+          var div = (e || window.event).target || (e || window.event).srcElement;
+          var num = div == nums ? NaN : Number(div.innerHTML);
+          if (!isNaN(num)) handler(num, div);
+        }
+      };
+
       function sizeBar() {
         if (frame.offsetWidth == 0) return;
         for (var root = frame; root.parentNode; root = root.parentNode){}
@@ -341,7 +368,7 @@ var CodeMirror = (function(){
         var targetHeight = 50 + Math.max(body.offsetHeight, Math.max(frame.offsetHeight, body.scrollHeight || 0)),
             lastNumber = Math.ceil(targetHeight / lineHeight);
         for (var i = scroller.childNodes.length; i <= lastNumber; i++) {
-          var div = document.createElement("DIV");
+          var div = createHTMLElement("div");
           div.appendChild(document.createTextNode(fill ? String(i + self.options.firstLineNumber) : "\u00a0"));
           scroller.appendChild(div);
         }
@@ -368,7 +395,7 @@ var CodeMirror = (function(){
         function setNum(n, node) {
           // Does not typically happen (but can, if you mess with the
           // document during the numbering)
-          if (!lineNum) lineNum = scroller.appendChild(document.createElement("DIV"));
+          if (!lineNum) lineNum = scroller.appendChild(createHTMLElement("div"));
           if (styleNums) styleNums(lineNum, node, n);
           // Changes are accumulated, so that the document layout
           // doesn't have to be recomputed during the pass
@@ -389,7 +416,11 @@ var CodeMirror = (function(){
             setNum(next++, node.previousSibling);
             for (; node && !win.isBR(node); node = node.nextSibling) {
               var bott = node.offsetTop + node.offsetHeight;
-              while (scroller.offsetHeight && bott - 3 > pos) setNum("&nbsp;");
+              while (scroller.offsetHeight && bott - 3 > pos) {
+                var oldPos = pos;
+                setNum("&nbsp;");
+                if (pos <= oldPos) break;
+              }
             }
             if (node) node = node.nextSibling;
             if (new Date().getTime() > endTime) {
@@ -433,7 +464,7 @@ var CodeMirror = (function(){
     },
 
     setDynamicHeight: function() {
-      var self = this, activity = self.options.cursorActivity, win = self.win, body = win.document.body,
+      var self = this, activity = self.options.onCursorActivity, win = self.win, body = win.document.body,
           lineHeight = null, timeout = null, vmargin = 2 * self.frame.offsetTop;
       body.style.overflowY = "hidden";
       win.document.documentElement.style.overflowY = "hidden";
@@ -456,7 +487,7 @@ var CodeMirror = (function(){
           self.wrapping.style.height = Math.max(vmargin + computedHeight, self.options.minHeight) + "px";
       }
       setTimeout(updateHeight, 300);
-      self.options.cursorActivity = function(x) {
+      self.options.onCursorActivity = function(x) {
         if (activity) activity(x);
         clearTimeout(timeout);
         timeout = setTimeout(updateHeight, 100);
@@ -485,10 +516,10 @@ var CodeMirror = (function(){
       options.height = area.style.height;
     if (options.content == null) options.content = area.value;
 
+    function updateField() {
+      area.value = mirror.getCode();
+    }
     if (area.form) {
-      function updateField() {
-        area.value = mirror.getCode();
-      }
       if (typeof area.form.addEventListener == "function")
         area.form.addEventListener("submit", updateField, false);
       else
@@ -501,7 +532,7 @@ var CodeMirror = (function(){
         area.form.submit();
         area.form.submit = wrapSubmit;
       }
-      area.form.submit = wrapSubmit;
+      try {area.form.submit = wrapSubmit;} catch(e){}
     }
 
     function insert(frame) {
@@ -513,11 +544,13 @@ var CodeMirror = (function(){
 
     area.style.display = "none";
     var mirror = new CodeMirror(insert, options);
+    mirror.save = updateField;
     mirror.toTextArea = function() {
+      updateField();
       area.parentNode.removeChild(mirror.wrapping);
       area.style.display = "";
       if (area.form) {
-        area.form.submit = realSubmit;
+        try {area.form.submit = realSubmit;} catch(e) {}
         if (typeof area.form.removeEventListener == "function")
           area.form.removeEventListener("submit", updateField, false);
         else
@@ -533,7 +566,7 @@ var CodeMirror = (function(){
     var match;
     if (window.opera)
       return Number(window.opera.version()) >= 9.52;
-    else if (/Apple Computers, Inc/.test(navigator.vendor) && (match = navigator.userAgent.match(/Version\/(\d+(?:\.\d+)?)\./)))
+    else if (/Apple Computer, Inc/.test(navigator.vendor) && (match = navigator.userAgent.match(/Version\/(\d+(?:\.\d+)?)\./)))
       return Number(match[1]) >= 3;
     else if (document.selection && window.ActiveXObject && (match = navigator.userAgent.match(/MSIE (\d+(?:\.\d*)?)\b/)))
       return Number(match[1]) >= 6;