kit_cms 2.3.16 → 2.3.17

data/app/models/html_asset.rb

@@ -35,6 +35,9 @@ class HtmlAsset < ActiveRecord::Base
   end
   
   def write_to_file
+    parent = File.join(Rails.root, "public", "kit", self.file_type)
+    FileUtils.mkdir_p(parent) unless File.exists?(parent)
+
     path = File.join(Rails.root, "public", "kit", self.file_type, self.kit_name)
     dir = File.join(Rails.root, "public", "kit", self.file_type)
     found = false

data/app/models/mapping.rb

@@ -1,3 +1,4 @@
 class Mapping < ActiveRecord::Base
+  attr_accessible :source_url, :target_url, :is_asset, :user_id, :status_code, :is_active, :params_url, :is_page, :system_id, :is_asset, :hidden
   belongs_to :user
 end

data/app/models/user.rb

@@ -117,7 +117,7 @@ class User < KitIndexed
 
   after_create :welcome_message
 
-  validates :display_name, :uniqueness=>{:scope=>:system_id}
+  validates :display_name, :uniqueness=>{:scope=>:system_id}, :allow_blank => true
   validates :email, :presence=>true, :uniqueness=>{:scope=>:system_id}
   validates :password, :presence=>true, :confirmation=>true, :on=>:create
   validates_confirmation_of :password, :on=>:create

data/app/views/admin/blocks/_form.html.haml

@@ -24,7 +24,7 @@
     %a(name='editor')
     %p
       = f.label :body
-      = cm_editor('html', :block, :body, f)
+      = cm_editor('xml', :block, :body, f)
     %p
       = kit_submit "Save"
       = kit_submit "Save And Edit Again"

data/app/views/admin/dashboard/user_comments.html.haml

@@ -1,7 +1,6 @@
 - content_for :page_scripts do
 
   function updated(id, moderated, visible) {
-  console.debug(moderated + " " + visible);
   var mod;
   var nmod;
   var vis;
@@ -25,8 +24,6 @@
   vnmod = 0;
   }
 
-  console.debug(id + ", " + moderated + ", " + visible + ", " + mod + ", " + nmod + "," + vis + ", " + vnmod);
-
   $('#mod_link_' + id + ' a').text(mod).attr('href', '/admin/dashboard/user_comment/' + id + '?comment[is_moderated]='+nmod);
 
   $('#vis_link_' + id + ' a').text(vis).attr('href', '/admin/dashboard/user_comment/' + id + '?comment[is_visible]='+vnmod);
@@ -57,18 +54,32 @@
       %th(width='200') User
       %th Moderated
       %th Visible
+      %th Delete
     - @comments.each do |comment|
-      %tr
+      %tr(class="comment_#{comment.id}")
         %td
           = link_to comment.url, comment.url
         %td
           = link_to_if comment.user_id!=0, comment.user_email, "/admin/user/#{comment.user_id}" 
         %td(id="mod_link_#{comment.id}")
-          = link_to comment.is_moderated? ? 'Yes' : 'No', "/admin/dashboard/user_comment/#{comment.id}?comment[is_moderated]=#{comment.is_moderated? ? 0 : 1}", :method=>:post, :remote=>true
+          = icon_to comment.is_moderated? ? 'Yes' : 'No', "/admin/dashboard/user_comment/#{comment.id}?comment[is_moderated]=#{comment.is_moderated? ? 0 : 1}", false, :method=>:post, :remote=>true
         %td(id="vis_link_#{comment.id}")
-          = link_to comment.is_visible? ? 'Yes' : 'No', "/admin/dashboard/user_comment/#{comment.id}?comment[is_visible]=#{comment.is_visible? ? 0 : 1}", :method=>:post, :remote=>true
-      %tr
-        %td(colspan="4")
+          = icon_to comment.is_visible? ? 'Yes' : 'No', "/admin/dashboard/user_comment/#{comment.id}?comment[is_visible]=#{comment.is_visible? ? 0 : 1}", false, :method=>:post, :remote=>true
+        %td(id="delete_link_#{comment.id}")
+          = icon_to "Delete", "/admin/dashboard/user_comment/#{comment.id}?delete=1", false, :method=>:post, :remote=>true, :confirm=>"Are you sure?"
+      %tr(class="comment_#{comment.id}")
+        %td(colspan="5")
+          .info
+            Name: 
+            = comment.user_name
+          .info
+            Email:
+            = comment.user_email
+          .info
+            URL:
+            = link_to comment.user_url, comment.user_url
+          %br
           = field_reveal(comment.body, 200)
+          %hr
 
 

data/app/views/admin/experiments/show.html.haml

@@ -44,7 +44,7 @@
 
     %p
       %label End Date
-      = @experiment.end_date.to_s(:short)
+      = @experiment.end_date.to_s(:short) rescue ''
 
     %p
       %label Goal

data/app/views/admin/form/_form.html.haml

@@ -52,6 +52,14 @@
         .field_help
           Include new and updated entries in system activity log
 
+      - if @form.respond_to?(:layout)
+        %li.advanced
+          = f.label "Layout"
+          = f.select :layout, options_from_collection_for_select(Layout.sys(_sid).order(:name).all, 'name', 'name')
+
+          .field_help
+            The layout to use for this form when rendering it as a page.
+
       %li.advanced
         = f.label "Stylesheets"
         = f.text_field :stylesheets

data/app/views/admin/page_templates/_form.html.haml

@@ -43,7 +43,7 @@
           If this template has an equivalent version for mobile devices, select it here.  As such, practically this is mutually exclusive with the "For mobile devices" option above.
     %p
       = f.label :body
-      = cm_editor('html', :page_template, :body, f)
+      = cm_editor('xml', :page_template, :body, f)
       .field_help
         The content of the template.  
     %p

data/app/views/admin/views/_form.html.haml

@@ -11,17 +11,17 @@
 
     %p
       = f.label :body
-      = f.text_area :body
+      = cm_editor("html", :view, :body, f, nil, :height=>"400px")
 
     %p
       = f.label :header
-      = f.text_area :header
+      = cm_editor("html", :view, :header, f, nil, :height=>"120px")
       .field_help
         Optional
 
     %p
       = f.label :footer
-      = f.text_area :footer
+      = cm_editor("html", :view, :footer, f, nil, :height=>"120px")
       .field_help
         Optional
 
@@ -50,7 +50,7 @@
 
     %p 
       = f.label :layout_id
-      = f.select :layout_id, options_from_collection_for_select(Layout.order(:name).all, :id, :name, @view.layout_id)
+      = f.select :layout_id, options_from_collection_for_select(Layout.sys(_sid).order(:name).all, :id, :name, @view.layout_id)
       .field_help
         Only used if rendering this view as a whole page.  Not used if rendering the view in another page
 

data/app/views/calendar/_calendar_scripts.js.erb

@@ -4,7 +4,7 @@ function month_show_day(day) {
     $('#day_' + i).hide();
   }
   $('#day_' + day).show().find('li').show();
-  $('li.selected').removeClass('selected');
+  $('table td.selected').removeClass('selected');
   $('#box_' + day).addClass('selected');
 }
 
@@ -12,7 +12,7 @@ function month_show_entry(day, entry) {
   month_show_day(day);
   $('#day_' + day + " li").hide();
   $('.entry_' + entry).show();
-  $('li.selected').removeClass('selected');
+  $('table td.selected').removeClass('selected');
   $('#box_' + day).addClass('selected');
 }
 

data/app/views/calendar/_month.html.haml

@@ -75,18 +75,32 @@
       .next
         = link_to ">".html_safe, current_path_with_new_params("month=#{next_month}&year=#{next_year}&srid=#{params[:srid]}&etid=#{params[:etid]}")
 
-  - if options[:show_days]
-    .clear
-    %ol.titles.clearfix
-      - for day in ["Monday", "Tuesday", "Wednesday", "Thursday", "Friday", "Saturday", "Sunday"] do
-        %li
-          = day
-      .clear
-    %br 
-  %ol.grid.clearfix
+
+  %table(class="#{mini ? 'mini' : 'full'}")
+    %tr.titles
+      - if options[:show_days]
+        %th.monday Monday
+        %th.tuesday Tuesday
+        %th.wednesday Wednesday
+        %th.thursday Thursday
+        %th.friday Friday
+        %th.saturday Saturday
+        %th.sunday Sunday
+
+    - row = 1
+    - col = 0 
+
     - entries.keys.sort.each do |key|
       - days = entries[key]
-      %li(id="box_#{key}" rel='#{key}' class="date_box #{date.strftime("%A").downcase if key==1} #{'today' if (date+(key-1).days).to_date==Date.today}")
+      - col += 1
+      = "<tr>".html_safe if col==1
+
+      - if col==1 && row==1
+        - while col < Date.new(date.year, date.month, 1).wday
+          = "<td class='pad'>&nbsp;</td>".html_safe
+          - col += 1
+
+      %td(id="box_#{key}" rel="#{key}" class="date_box #{date.strftime("%A").downcase if key==1} #{'today' if (date+(key-1).days).to_date==Date.today}")
         - if mini
           = key
         - else
@@ -94,23 +108,40 @@
         - if days.size==0 || mini
           &nbsp;
         - else 
-          %div
-            - cnt = 0
-            - days.each do |entry|
-              - cnt += 1
-              %p
-                - if cnt>3
-                  - if Preference.get_cached(_sid, 'calendar_show_event_count')=='true'
-                    - cnt = days.size
-                    .event_count
-                      = "#{cnt}"
-                  
-                  = link_to_function "more...", "month_show_day(#{key})"
-                  - break
-                - else
-                  = "*" unless entry.approved_at
-                  = link_to_function truncate(entry.name, :length=>20), "month_show_entry(#{key}, #{entry.id})"
-    .clear
+          - cnt = 0
+          - days.each do |entry|
+            - cnt += 1
+            %p
+              - if cnt>3
+                - if Preference.get_cached(_sid, 'calendar_show_event_count')=='true'
+                  - cnt = days.size
+                  .event_count
+                    = "#{cnt}"
+                
+                = link_to_function "more...", "month_show_day(#{key})"
+                - break
+              - else
+                = "*" unless entry.approved_at
+                = link_to_function truncate(entry.name, :length=>20), "month_show_entry(#{key}, #{entry.id})"
+
+
+      - if col==7
+        = "</tr>".html_safe
+        - col = 0
+        - row += 1
+    - need_close = false
+    - if col > 0
+      - while col < 7
+        = "<td class='pad'>&nbsp;</td>".html_safe
+        - col += 1
+        - need_close = true
+
+    = "</tr>".html_safe if need_close
+
+
+
+        
+  .clear
 
   - unless mini
     .details

data/app/views/category/_select_options.html.erb

@@ -1 +1 @@
-<% @categories.each do |cat| -%><option value="<%= cat.id %>"><%= cat.path %></option><% end -%>
+<% @categories.each do |cat| -%><option value="<%= cat.id %>"><%= cat.path.strip %></option><% end -%>

data/app/views/form/_show.html.haml

@@ -1,12 +1,15 @@
+- first_field = nil
 - content_for :page_scripts do 
   $(document).ready(function() {
 
   - form.form_fields.each do |field|
+    - first_field = field
     - next unless field.form_field_type.html_options.not_blank?
     - field.form_field_type.html_options.split('|').each do |hh|
       $('#field_#{field.id}').attr('#{hh.split('=')[0]}', #{hh.split('=')[1]});
   $('#form_#{form.id}').validate();
-  $('#field_#{form.form_fields.first.id}').focus();
+  - if first_field
+    $('#field_#{first_field.id}').focus();
   });
 
 %div(class="#{form.klass}")
@@ -14,6 +17,11 @@
     .form-title
       = form.title
 
+  - if first_field == nil && (is_admin? || (current_user && form.user_id==current_user.id) ) 
+    This form has no fields.  Go to the
+    = link_to "form in the dashboard", "/admin/form/#{form.id}/fields"
+    to add some.  Normal users will not see this message.
+
   - if show_body
     .body
       = form.body.html_safe

data/app/views/forum/_add_post.html.haml

@@ -34,7 +34,9 @@
         #body
           %label(label_for='post_body')
             = t "forum.post_body"
-          = form.text_area :body
+          .post_box(style="border: thin #AAA solid; margin-bottom: 10px;")
+            = f.text_area :body
+            = cm_editor('markdown', :topic_post, :body, form, nil, {:theme=>"neat", :dont_show_mode=>true, :dont_show_line_numbers=>true, :height=>300, :show_toolbar=>true}) if Preference.get_cached(_sid, "use_markdown_editor")=="true"
 
         - formatting = kit_snippet('Forum Post Formatting Help')
         - if formatting.not_blank?
@@ -43,7 +45,6 @@
 
         #submit
           = link_to_function t("forum.submit_post"), "send_this_form();", :class=>"action"
-          = link_to_function t("forum.preview_post"), "$('#body .markItUpButton9').mouseup();", :class=>"action"
           .display_name
             Posting as "
             = current_user.display_name if current_user && current_user.display_name

data/app/views/forum/_mod_thread.js.erb

@@ -43,8 +43,8 @@ function edit_post(thread_id, post_id) {
   body.append('<div id="popup_form"></div>');
   div = $('#popup_form');
 
- div.append('Post: <textarea style="width:95%;" rows="18" id="topic_post_body_mod"></textarea>');
-  markdown_editor('#topic_post_body_mod');
+  div.append('Post: <textarea style="width:95%;" rows="18" id="topic_post_body_mod"></textarea>');
+  // TODO: Markdown editor
   div.append('Comment: <textarea style="width:95%;" rows="6" id="comment"></textarea>');
   div.append('<br/><input type="button" onClick="save_edit();" value="Save"/>');
   $('#topic_post_body_mod').load("/forums/post/"+post_id);

data/app/views/forum/_post_scripts.js.erb

@@ -14,7 +14,6 @@ $(document).ready(function() {
     show_post();
   <% end %>
 
-  markdown_editor('#topic_post_body');
 });
 
 var editing_id = null;
@@ -28,9 +27,9 @@ function user_edit_post(post_id) {
   div = $('#popup_form');
 
   div.append('Post: <textarea style="width:95%;" rows="18" id="topic_post_body_edit"></textarea>');
+  // TODO Markdown editor
   div.append('<br/><input type="button" onClick="user_save_edit();" value="Save"/>');
   $('#topic_post_body_edit').load("/forums/post/"+post_id);
-  markdown_editor('#topic_post_body_edit');
   editing_id = post_id;
 }
 

data/app/views/forum/thread.html.haml

@@ -2,6 +2,10 @@
   - content_for :page_scripts do
     = render :partial=>"mod_thread", :formats=>[:js]
 
+- content_for :head do
+  = javascript_include_tag "codemirror/editor"
+  = stylesheet_link_tag "codemirror/editor"
+
 #forums
   = render(:partial=>"introduction")
   .titles(class='clearfix')

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

@@ -0,0 +1 @@
+<%= yield %>

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

@@ -3,9 +3,9 @@
 <head>
   <title><%= yield :title %></title>
   <!-- layout: minimal -->
-
+  
+  <%= stylesheet_link_tag "kit/cms" %>
   <%= render :partial=>'/layouts/cms-common', :locals=>{:include_menu=>true} %>
-  <%= stylesheet_link_tag "kit_admin" %>
 
   <%= csrf_meta_tag %>
 

data/app/views/notification/form_submission.text.erb

@@ -3,3 +3,5 @@ The following form has been submitted:
 <% @sub.form_submission_fields.each do |field| %>
   <%= field.form_field.name %>: <%= field.value %> 
 <% end %>
+
+View online:  <%= "#{Preference.get_cached(@sid, 'host')}/admin/forms/#{@sub.form_id}/browse?id=#{@sub.id}" %>

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

@@ -19,7 +19,7 @@
   = render :partial=>"google_preview"
 
   - simple_mode = pref('advanced_mode')!='advanced'
-
+  - advanced_mode = !simple_mode
 
 #pageinfo.cms_form(style="margin-bottom: 10px;")
   = form_for @page do |f|
@@ -32,15 +32,14 @@
         = f.hidden_field :copy_of
 
       - if @page.new_record? 
-        - category_visible = !simple_mode || @page.category_id==nil || @page.errors[:name]
+        - category_visible = advanced_mode || params[:cat_id]==nil || @page.errors[:name].size>0
         %li(class='select optional more_options' id='article_category_input' style="#{'display: none;' unless category_visible}")
           %label(for='article_category_id') Category
-          = text_field_tag "category_filter", '', {"data-focus"=>has_cat ? '':'special'}
-          -  cat_options = page.category_id ?  "<option value='#{page.category.id}'>#{page.category.path}</option>" :  options_from_collection_for_select(Category.order('name').sys(_sid).all, :id, :name) 
-          = select_tag "page[category_id]", cat_options.html_safe
-          %br
-          .field_help
-            Enter any part of the name of the desired category
+          -  cat_options = options_from_collection_for_select(Category.order('path').sys(_sid).all, :id, :path, @page.category_id || params[:cat_id]) 
+          = select_tag "page[category_id]", cat_options.html_safe, :style=>"width: 542px;"
+          %span.category_filter
+            = icon_to_function "Filter Categories", "$('.category_filter input').show().focus(); $('.category_filter a').hide();", false
+            = text_field_tag "category_filter", '', {"data-focus"=>has_cat ? '':'special', :style=>"width: 100px; display: none;"}
           #category_warning
       - else 
         %script(type='text/javascript')

data/app/views/pages/_page_scripts.js.erb

@@ -29,8 +29,7 @@ $('input#page_title').change(function() {
   }
 });
 
-$('#category_filter').bind('keydown', function () {
-  if ($(this).val().length>0) {
+$('#category_filter').bind('keyup', function () {
     $('#wait').show();
     $.ajax({type:"POST", 
       url:"/category/select_options", 
@@ -39,7 +38,6 @@ $('#category_filter').bind('keydown', function () {
         $('#wait').hide();
       },
       data:"type=page&search="+$(this).val()});
-  }
 });
 
 $('#category_filter').focus();

data/app/views/pages/_page_template_script.js.erb

@@ -0,0 +1,28 @@
+var current_page_template_id = <%= current %>;
+
+$(document).ready(function() {
+  $('#page_page_template_id').on('change', function() {
+    $('#error_explanation').hide();
+    var template_id = $('#page_page_template_id').val();
+    if (template_id == current_page_template_id) {
+      return;
+    }
+    $.get('/admin/page_templates/' + template_id + "/mapping", null, function(data) {
+      var options = '<option></option>';
+      $.each(data, function(index, value) {
+        options = options + "<option value='" + value + "'>";
+        options = options + value + "</option>";
+      });
+
+      $('.field_select').html($(options));
+      $('.field_select').each(function () {
+        var select = $(this);
+        var data_name = select.attr('data-name');
+        select.find('option').each(function() { 
+          this.selected = (this.value == data_name); 
+        });
+      });
+      $('ul#mapping').show();      
+    });
+  });
+});