kit_cms 2.3.16 → 2.3.17

data/app/views/pages/cookie_text.html.haml

@@ -1,5 +1,5 @@
 %p
-  = kit_snippet('cookie-text', 'If you want to use this website, to comply with EU legislation, you need to grant us the right to place cookies in your webbrowser.  If you do not agree to this then unfortunately you will be unable to use this website. <a href="/cookies">More info</a>.'.html_safe)
+  = kit_snippet('cookie-text', 'If you want to use this website, to comply with EU legislation, you need to grant us the right to place cookies in your webbrowser.  If you do not agree to this then unfortunately you will be unable to use this website. <a href="/cookies">More info</a>.'.html_safe, _sid)
 
 %p(style="margin-top: 10px; width: 60px; margin-left: auto; margin-right: auto;")
   = button_to_function "Grant", "accept_cookies();", :name=>"grant"

data/app/views/pages/info.html.erb

@@ -65,7 +65,6 @@ return false;
       <td><%= @page.locked? ? "Yes" : "No" %></td>
       <td><%= link_to @page.locked? ? "No" : "Yes", "/page/#{@page.id}/info?locked=#{!@page.locked?}", :class=>"action", :method=>:post %></td>
     </tr>
-
     
     <tr>
       <td>Path:</td>
@@ -73,7 +72,8 @@ return false;
     </tr>
     <tr>
       <td>Template:</td>
-      <td colspan='2'><%= link_to(@page.page_template.name, "/admin/page_templates/#{@page.page_template_id}") rescue '' %></td>
+      <td><%= link_to(@page.page_template.name, "/admin/page_templates/#{@page.page_template_id}") rescue '' %></td>
+      <td><%= icon_to "Change", "/page/#{@page.id}/page_template", false, :style=>"position:relative; left: -3px;" %></td>
     </tr>
 
     <% if @page.page_template && @page.page_template.has_mobile_version? && feature?("mobile_templates") %>

data/app/views/pages/page_template.html.haml

@@ -0,0 +1,40 @@
+- content_for :head do
+  %script(type='text/javascript')
+    = render :partial=>"/pages/page_template_script", :formats=>:js, :locals=>{:current=>@page.page_template_id}
+
+- content_for :main do 
+
+  %h1.page_icon Page Template for '#{@page.title}'
+
+  %h3 
+    Current Template: 
+    = @page.page_template.name
+
+  %h3 
+    New Template
+
+  = form_for @page , :url=>"/page/#{@page.id}/page_template" do |f|
+    = f.select :page_template_id, options_from_collection_for_select(PageTemplate.sys(_sid).order(:display_order).all, :id, :name, @page.page_template_id)
+
+    #error_explanation(style="display: none;")
+
+    - contents = @page.current_content
+    %ul#mapping(style="display: none;")
+      %li 
+        %h3 Editable Region Mappings
+        %p
+          When moving to a new template you must map the editable regions for the current page
+          to the the ones present in the new template. Where the name matches they have already
+          been selected.  Make the other selections as appropriate and click Save to make the change.
+          %span.check_error
+            The contents of any regions which are not mapped will be discarded. 
+
+      - contents.each do |content|
+        %li(id="field_#{content.id}")
+          %label
+            = content.field_name
+          = select_tag "f_#{content.field_name}", "<option></option>".html_safe, {:class=>"field_select", "data-name"=>content.field_name}
+
+      %li(style='margin-top: 10px;')
+        = kit_submit "Save"
+

data/app/views/utility/_cm_editor.html.erb

@@ -1,17 +1,46 @@
 <script type="text/javascript">
   $(document).ready(function() {
       var editor_a = parent.document.getElementById('<%= form_field %>');
-      var options = { lineNumbers: true, theme: 'blackboard-cms', indentUnit: 2, lineWrapping: true, matchBrackets: true  , collapseRange: true, mode : '<%= mode %>'};
-  html_editor = parent.CodeMirror.fromTextArea(editor_a, options);
+      var options = { 
+      <% unless options[:dont_show_line_numbers] %>
+      lineNumbers: true, 
+      <% end %>
+      theme: "<%= options[:theme] || 'blackboard-cms' %>", 
+      indentUnit: 2, 
+      lineWrapping: true, 
+      matchBrackets: true, 
+      collapseRange: true, 
+      mode : '<%= mode %>'};
+      var html_editor = parent.CodeMirror.fromTextArea(editor_a, options);
+      html_editors["<%= form_field %>"] = html_editor;
   html_editor.focus();
-    
+  <% height = options[:height] %>
+  <% width = options[:width] %>
+  <% if height || width %>
+    <% width = width ?  "\"#{width}\"" : 'null' %>
+    <% height = height ?  "\"#{height}\"" : 'null' %>
+    <%= "html_editor.setSize(#{width}, #{height})".html_safe %>
+  <% end %>
+   
   });
 </script>
 
-<div id='editor_mode'>Mode: <%= (mode=='htmlmixed' ? 'html' : mode).upcase %>
+<% unless options[:dont_show_mode] %>
+<div class='editor_mode'>Mode: <%= (mode=='htmlmixed' ? 'html' : mode).upcase %>
 </div>
+<% end %>
 
-<%= form.text_area field %>
+<% if options[:show_toolbar] %>
+<div class='toolbar'>
+  <%= render :partial=>"utility/cm_toolbar_#{mode}", :locals=>{:name=>form_field} %>
+</div>
+<% end %>
 
+<%= form.text_area field %>
 
+<% unless options[:no_preview] %>
+<div id="preview_<%= form_field %>" class='markdown_preview' style='display: none;'>
+  Please wait whilst the preview loads
+</div>
+<% end %>
 

data/app/views/utility/_cm_toolbar_markdown.html.haml

@@ -0,0 +1,49 @@
+- rand = rand(100000)
+
+
+%ul.markdown.clearfix(id="tb_#{rand}")
+  
+  %li.bold(data-cmd="undo" data-hint="Undo")
+    = image_tag "/assets/kit/toolbar/undo.png"
+    %label Undo
+  %li.spacer.bold(data-cmd="redo" data-hint="Redo")
+    = image_tag "/assets/kit/toolbar/redo.png"
+    %label Redo
+
+  %li.bold(data-cmd="bold" data-hint="Bold")
+    = image_tag "/assets/kit/toolbar/bold.png"
+    %label Bold
+  %li.spacer.underline(data-cmd="underline" data-hint="Underline")
+    = image_tag "/assets/kit/toolbar/underline.png"
+    %label Underline
+  %li.list(data-cmd="list" data-hint="Bullet Point List")
+    = image_tag "/assets/kit/toolbar/list.png"
+    %label List
+  %li.spacer.numbered_list(data-cmd="numbered_list" data-hint="Numbered List")
+    = image_tag "/assets/kit/toolbar/numbered_list.png"
+    %label Numbered
+  %li.image(data-cmd="image" data-hint="Insert Image")
+    = image_tag "/assets/kit/toolbar/image.png"
+    %label Image
+  %li.link(data-cmd="link" data-hint="Insert Link")
+    = image_tag "/assets/kit/toolbar/link.png"
+    %label Link
+  %li.spacer.link(data-cmd="video" data-hint="Insert Video")
+    = image_tag "/assets/kit/toolbar/video.png"
+    %label Video
+  %li.quote(data-cmd="quote" data-hint="Quote")
+    = image_tag "/assets/kit/toolbar/quote.png"
+    %label Quote
+  %li.spacer.pre(data-cmd="pre" data-hint="Preformatted")
+    = image_tag "/assets/kit/toolbar/formatted.png"
+    %label Formatted
+  %li.pre(data-cmd="preview" data-hint="Preview")
+    = image_tag "/assets/kit/toolbar/preview.png"
+    %label Preview
+  
+%script
+  $(document).ready(function() {
+  $('#tb_#{rand} li').on('click', function() {
+  if ($(this).attr('data-cmd')) { do_cmd("#{name}", $(this).attr('data-cmd')); }
+  });
+  });

data/config/initializers/devise_extender.rb

@@ -20,6 +20,7 @@ module DeviseExtender
       options[:type] = custom_template.template_type || 'erb'
       options[:inline] = custom_template.body
       options[:layout] = custom_template.layout.path
+
       super options
     else
       super name, options
@@ -27,4 +28,12 @@ module DeviseExtender
   end
 
 
+  def stylesheets
+    custom_template = PageTemplate.get_custom_template(_sid, kit_template ? kit_template : name, request)
+    if custom_template
+      return custom_template.layout.stylesheets.split(',').uniq
+    else
+      return ["application"]
+    end
+  end
 end

data/config/initializers/html_assets.rb

@@ -0,0 +1,4 @@
+
+HtmlAsset.find_each do |ha|
+  ha.write_to_file
+end

data/config/initializers/quiet_asserts.rb

@@ -1,4 +1,4 @@
-Rails.application.assets.logger = Logger.new('/dev/null')
+#Rails.application.assets.logger = Logger.new('/dev/null')
 Rails::Rack::Logger.class_eval do
   def call_with_quiet_assets(env)
     previous_level = Rails.logger.level

data/config/routes.rb

@@ -48,6 +48,7 @@ Rails.application.routes.draw do
   post "/admin/calendar_entries/:id" => "admin/calendar_entries#show" 
   get "/admin/calendars/:calendar_id/:start_date/:id" => "admin/calendar_entries#show"
   get "/admin/page_templates/:id/pages" => "admin/page_templates#pages"
+  get "/admin/page_templates/:id/mapping" => "admin/page_templates#mapping"
   match "/tickets/:item_model/:item_id" => "calendar#buy_tickets"
   get "/tickets/sold_as_csv/:item_model/:item_id" => "calendar#sold_as_csv"
 
@@ -316,6 +317,7 @@ Rails.application.routes.draw do
   get 'pages/zoom' => 'pages#zoom'
   post 'page/unique' => 'pages#unique'
   get 'page/info' => 'pages#info'
+  match 'page/:id/page_template' => 'pages#page_template', :only=>[:get, :post]
   post 'page/:id/copy' => 'pages#copy'
   delete 'page/:id/terms/:term_id' => 'pages#terms'
   match '/page/:id/terms' => 'pages#terms'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: kit_cms
 version: !ruby/object:Gem::Version
-  version: 2.3.16
+  version: 2.3.17
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-01-22 00:00:00.000000000 Z
+date: 2013-02-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -428,7 +428,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rdiscount
+  name: rdiscount-dsc
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
@@ -2360,6 +2360,18 @@ files:
 - app/assets/images/kit/icons/white/48/wrench_plus_icon&48.png
 - app/assets/images/kit/icons/white/48/youtube_icon&48.png
 - app/assets/images/kit/icons/white/48/zoom_icon&48.png
+- app/assets/images/kit/toolbar/bold.png
+- app/assets/images/kit/toolbar/formatted.png
+- app/assets/images/kit/toolbar/image.png
+- app/assets/images/kit/toolbar/link.png
+- app/assets/images/kit/toolbar/list.png
+- app/assets/images/kit/toolbar/numbered_list.png
+- app/assets/images/kit/toolbar/preview.png
+- app/assets/images/kit/toolbar/quote.png
+- app/assets/images/kit/toolbar/redo.png
+- app/assets/images/kit/toolbar/underline.png
+- app/assets/images/kit/toolbar/undo.png
+- app/assets/images/kit/toolbar/video.png
 - app/assets/images/kit/wait.gif
 - app/assets/images/menu/logo.png
 - app/assets/images/menu/menu_bg.gif
@@ -2392,6 +2404,7 @@ files:
 - app/assets/javascripts/codemirror/javascript.js
 - app/assets/javascripts/codemirror/jquery.js
 - app/assets/javascripts/codemirror/loadmode.js
+- app/assets/javascripts/codemirror/markdown.js
 - app/assets/javascripts/codemirror/match-highlighter.js
 - app/assets/javascripts/codemirror/matchbrackets.js
 - app/assets/javascripts/codemirror/multiplex.js
@@ -3111,6 +3124,7 @@ files:
 - app/views/images/index.html.haml
 - app/views/images/index.js.erb
 - app/views/images/media_modal.html.erb
+- app/views/layouts/_application.html.erb
 - app/views/layouts/_cms-common.html.erb
 - app/views/layouts/_html-editor.html.haml
 - app/views/layouts/_kit_header.html.haml
@@ -3162,6 +3176,7 @@ files:
 - app/views/pages/_mercury-notes.html.haml
 - app/views/pages/_meta.html.erb
 - app/views/pages/_page_scripts.js.erb
+- app/views/pages/_page_template_script.js.erb
 - app/views/pages/_search_form.html.haml
 - app/views/pages/_search_results.html.haml
 - app/views/pages/_term.html.haml
@@ -3183,6 +3198,7 @@ files:
 - app/views/pages/mock.html.haml
 - app/views/pages/new.html.erb
 - app/views/pages/notes.html.haml
+- app/views/pages/page_template.html.haml
 - app/views/pages/remove_term.js.erb
 - app/views/pages/save_content.rjs
 - app/views/pages/search.html.erb
@@ -3200,6 +3216,7 @@ files:
 - app/views/user/user_profile.html.haml
 - app/views/utility/_button_to_with_params.html.haml
 - app/views/utility/_cm_editor.html.erb
+- app/views/utility/_cm_toolbar_markdown.html.haml
 - app/views/utility/_design_history.html.haml
 - app/views/utility/_fetch_rss.html.erb
 - app/views/utility/_map.html.haml
@@ -3224,6 +3241,7 @@ files:
 - config/initializers/geokit_config.rb
 - config/initializers/haml.rb
 - config/initializers/honeypot.rb
+- config/initializers/html_assets.rb
 - config/initializers/inflections.rb
 - config/initializers/kit_cache.rb
 - config/initializers/kit_indexes.rb