kit_cms 2.3.20 → 2.3.22

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

@@ -55,7 +55,7 @@
         = f.label :priority
         = f.text_field :priority
         .field_help
-          Optional, unless using URL Pattern, then mandatory.  If this zone uses a URL pattern and other zones also have patterns that match the current URL, the zone with the highest priority figure will be used
+          Optional, unless using URL Pattern, then mandatory.  If this zone uses a URL pattern and other zones also have patterns that match the current URL, the zone with the greatest priority figure will be used (e.g. a priority of 9 won't be shown if a priority of 10 exists)
 
 
       %li

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

@@ -41,6 +41,8 @@
   %p
     = icon_to "Edit", edit_admin_ad_zone_path(@ad_zone)
     = link_to "Destroy", [:admin, @ad_zone], :confirm => 'Are you sure?', :method => :delete, :class=>"action"
+    
+    = link_to "Create Block For This Ad Zone", "/admin/ad_zone/#{@ad_zone.id}/create_block", :class=>"action", :method=>:post
 
   %p
     = icon_to "Ad Zones", admin_ad_zones_path

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

@@ -24,7 +24,17 @@
     %a(name='editor')
     %p
       = f.label :body
-      = cm_editor('xml', :block, :body, f)
+      = cm_editor('block[body]', {:mode=>'xml'})
+
+    - if Preference.get_cached(_sid, "cms_server")=='true'
+      %p
+        = f.label "Share in CMS Repo"
+        = f.check_box :repo
+
+      %p
+        = f.label "Repo Tags"
+        = f.text_field :repo_tags
+
     %p
       = kit_submit "Save"
       = kit_submit "Save And Edit Again"

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

@@ -0,0 +1,9 @@
+- content_for :main do 
+
+  %h1 Broken Links
+
+  %ul
+    - @broken.each do |broken|
+      %li
+        = broken
+

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

@@ -63,4 +63,15 @@
             = best_in_place pref, :value, :path=>"/admin/system/#{pref.name}"
         %td(nowrap)= pref.updated_at.to_formatted_s(:short)
 
+  - if is_admin?
+    %h4 New Preference Setting
+    = form_for @preference, :url=>"/admin/system" do |f|
+      %p
+        %label Name
+        = f.text_field :name
+      %p
+        %label Value
+        = f.text_field :value
+      %p
+        = f.submit "Create"
 

data/app/views/admin/dj/index.html.haml

@@ -0,0 +1,43 @@
+- content_for :main do 
+
+  %h1 Delayed Jobs Queue
+
+  %h3 
+    Status:
+    = @running ? "Running [ #{@pid} ]" : "NOT Running"
+
+  - if @running
+    = icon_to "Stop Process", "/admin/dj?process=stop", false, :method=>:post
+    = icon_to "Restart Process", "/admin/dj?process=restart", false, :method=>:post
+  - else
+    = icon_to "Start Process", "/admin/dj?process=start", false,:method=>:post
+
+  %table.loosen
+    %tr
+      %th ID
+      %th Created
+      %th Priority
+      %th Attempts
+      %th 
+        Run At
+        %br
+        Click to run now
+      %th(nowrap) Failed At
+      %th Queue
+    - @delayed_jobs.each do |job|
+      %tr
+        %td
+          = job.id
+          = link_to "Delete", "/admin/dj?delete=#{job.id}", :method=>:post
+        %td= job.created_at
+        %td= job.priority
+        %td= job.attempts
+        %td= link_to job.run_at, "/admin/dj?id=#{job.id}", :method=>:post
+        %td= job.failed_at
+        %td= job.queue
+      %tr
+        %td(colspan='7')= truncate(job.handler, :length=>800)
+      - if job.last_error
+        %tr
+          %td(colspan='7')= truncate(job.last_error, :length=>800)
+

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

@@ -52,19 +52,24 @@
         .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')
+      %li.advanced
+        = f.label "Layout"
+        = f.select :layout_id, options_from_collection_for_select(Layout.sys(_sid).order(:name).all, 'id', 'name', @form.layout_id)
 
-          .field_help
-            The layout to use for this form when rendering it as a page.
+        .field_help
+          The layout to use for this form when rendering it as a page.
 
       %li.advanced
-        = f.label "Stylesheets"
-        = f.text_field :stylesheets
-        .field_help
-          Optional.  A comma separated list of stylesheets to include when showing this form.  'Application' is included by default if none are specified.  This is not included if the form is rendered as a block.
+        %label CSS
+        - HtmlAsset.sys(_sid).order(:name).where(:file_type=>"css").each do |ha|
+          = ha.name
+          = check_box_tag "form[html_asset_ids][]", ha.id, form_asset_selected(ha)
+      %li.advanced
+        %label Javascript
+        - HtmlAsset.sys(_sid).order(:name).where(:file_type=>"js").each do |ha|
+          = ha.name
+          = check_box_tag "form[html_asset_ids][]", ha.id, form_asset_selected(ha)
+
 
       %li.advanced
         = f.label "Class"

data/app/views/admin/group/index.html.haml

@@ -8,7 +8,7 @@
     = f.submit "Save"
 
   %ul
-    - Group.order(:name).all.each do |group|
+    - @groups.each do |group|
       %li(class='clearfix' style="margin-top: 5px;")
         = link_to group.name, "/admin/user?grp_id=#{group.id}", :style=>"margin-right: 20px;"
         = link_to "Delete", "/admin/group/#{group.id}", :method=>:delete, :class=>"action"

data/app/views/admin/help/edit.html.haml

@@ -11,7 +11,7 @@
       = f.text_field :path
 
       %label Content
-      = cm_editor('html', :help, :body, f)
+      = cm_editor("help[body]", {:mode=>'html'})
       %br
       = kit_submit "Save"
       or

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

@@ -16,7 +16,14 @@
 
         %li 
           %label Used By:
-          = (Layout.sys(_sid).where("(stylesheets='' and '#{@html_asset.name}'='application' and '#{@html_asset.file_type}'='css') or stylesheets like '%#{@html_asset.name}%' or javascripts like '%#{@html_asset.name}%'")+ PageTemplate.sys(_sid).where("(stylesheets='' and '#{@html_asset.name}'='application' ) or stylesheets like '%#{@html_asset.name}%' or javascripts like '%#{@html_asset.name}%'")).collect { |i| link_to "'#{i.name}' #{i.class.name.titleize}", "/admin/#{i.class.name.tableize}/#{i.id}" }.join(', ').html_safe
+          Layouts:
+          = @html_asset.layouts.pluck(:name).join(', ')
+          %br
+          Page Templates: 
+          = @html_asset.page_templates.pluck(:name).join(', ')
+          %br
+          Forms:
+          = @html_asset.forms.pluck(:title).join(', ')
         %li
           %label Last Updated By:
           = @html_asset.user.email rescue ''
@@ -31,7 +38,7 @@
           = flash[:notice]
 
       %a(name='editor')
-      = cm_editor(@html_asset.file_type, :html_asset, :body, f, "html_asset_body")
+      = cm_editor("html_asset[body]", {:mode=>@html_asset.file_type, :show_toolbar=>false})
 
       %p
         = render :partial=>"utility/design_history", :locals=>{:object=>@html_asset}

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

@@ -23,24 +23,18 @@
           %label Updated:
           = @layout.updated_at
         %li
-          %label Stylesheets
-          = f.text_field :stylesheets
-          %br
-          Existing stylesheets:
-          = HtmlAsset.where(:file_type=>"css").sys(_sid).order(:name).all.collect {|s| s.name}.join(", ")
-          .dehighlight
-            Comma separated list of stylesheets to include.  If left blank it will default to the standard 'application'.
-        %li
-          %label Javascripts
-          = f.text_field :javascripts
-          %br
-          Existing javascripts:
-          = HtmlAsset.where(:file_type=>"js").sys(_sid).order(:name).all.collect {|s| s.name}.join(", ")
-          .dehighlight
-            Comma separated list of javascripts to include.  If left blank it will default to none.
+          %label CSS
+          - HtmlAsset.sys(_sid).order(:name).where(:file_type=>"css").each do |ha|
+            = ha.name
+            = check_box_tag "layout[html_asset_ids][]", ha.id, layout_asset_selected(ha)
+        %li
+          %label Javascript
+          - HtmlAsset.sys(_sid).order(:name).where(:file_type=>"js").each do |ha|
+            = ha.name
+            = check_box_tag "layout[html_asset_ids][]", ha.id, layout_asset_selected(ha)
         %li
           %label Body
-          = cm_editor('html', :layout, :body, f)
+          = cm_editor('layout[body]', {:mode=>'html'})
 
         %li(style="margin-top: 10px;")
           = render :partial=>"utility/design_history", :locals=>{:object=>@layout}

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

@@ -43,27 +43,19 @@
           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('xml', :page_template, :body, f)
+      = cm_editor('page_template[body]', {:mode=>'xml'})
       .field_help
         The content of the template.  
     %p
-      = f.label :stylesheets
-      = f.text_field :stylesheets
-      %br
-      Existing stylesheets:
-      = HtmlAsset.sys(_sid).order(:name).where(:file_type=>"css").all.collect {|s| s.name}.join(", ")
-      .field_help
-        Comma separated list of stylesheets to include.  If left blank it will default to the standard 'application'. Do not use a file extension.
-
+      %label CSS
+      - HtmlAsset.sys(_sid).order(:name).where(:file_type=>"css").each do |ha|
+        = ha.name
+        = check_box_tag "page_template[html_asset_ids][]", ha.id, page_template_asset_selected(ha)
     %p
-      = f.label :javascripts
-      = f.text_field :javascripts
-      %br
-      Existing javascripts:
-      = HtmlAsset.sys(_sid).order(:name).where(:file_type=>"js").all.collect {|s| s.name}.join(", ")
-      .field_help
-        Comma separated list of javascripts to include.  If left blank it will default to none. Do not use a file extension.
-
+      %label Javascript
+      - HtmlAsset.sys(_sid).order(:name).where(:file_type=>"js").each do |ha|
+        = ha.name
+        = check_box_tag "page_template[html_asset_ids][]", ha.id, page_template_asset_selected(ha)
 
     %p
       = kit_submit "Save"

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

@@ -60,19 +60,20 @@
     %strong Stylesheets
     %br
     Layout:
-    = show_html_assets(@page_template.layout.stylesheets, "css")
+    = @page_template.layout.html_assets.where(:file_type=>"css").pluck(:name).join(", ")
     %br
     Template:
-    = show_html_assets(@page_template.stylesheets, "css")
+    = @page_template.html_assets.where(:file_type=>"css").pluck(:name).join(", ")
 
   %p
     %strong Javascripts
     %br
     Layout:
-    = show_html_assets(@page_template.layout.javascripts, "js")
+    = @page_template.layout.html_assets.where(:file_type=>"js").pluck(:name).join(", ")
     %br
     Template:
-    = show_html_assets(@page_template.javascripts, "js")
+    = @page_template.html_assets.where(:file_type=>"js").pluck(:name).join(", ")
+
 
   %p
     %strong= icon_to "Terms: ", "/admin/page_template_terms?page_template_id=#{@page_template.id}", false, :style=>"margin-right: 20px;"

data/app/views/admin/q/events.html.haml

@@ -0,0 +1,26 @@
+- content_for :main do
+
+  %h1.notificationqueue_icon= "Notification Queue '#{@publisher.name}' Events"
+
+  .link(style='margin: 20px 0;')
+    = icon_to "Notification Queue", "/admin/q/#{@publisher.id}"
+
+  - events = @publisher.q_events.order("id desc").page(params[:e_page]).per(100)
+
+  = paginate events, :params_name=>:e_page
+  %table.loosen_more
+    %tr
+      %th Topic
+      %th Occurred 
+      %th Processed
+      %th Class
+      %th Data
+    - events.each do |e|
+      %tr
+        %td= e.topic
+        %td= time_ago_in_words e.created_at
+        %td= time_ago_in_words e.processed_at rescue ''
+        %td= e.klass
+        %td= field_reveal(e.data, 250)
+  = paginate events, :param_name=>:e_page
+

data/app/views/admin/q/index.html.haml

@@ -0,0 +1,28 @@
+- content_for :main do 
+
+  %h1.notificationqueue_icon Notification Queue Publishers
+
+  .link(style="margin: 20px 0;")
+    = icon_to_show "Create", "create"
+
+  #create(style="display: none;")
+    = form_for @q_publisher, :url=>"/admin/q" do |f|
+      %label Name:
+      = f.text_field :name
+
+      = kit_submit "Create"
+
+  %table.loosen
+    %tr
+      %th Name
+      %th Authentication Method
+      %th Authentication ID
+      %th Delete
+    - @publishers.each do |publisher|
+      %tr
+        %td= link_to publisher.name, "/admin/q/#{publisher.id}"
+        %td= publisher.auth_method
+        %td= publisher.auth_id
+        %td= button_to "Delete", "/admin/q/#{publisher.id}", :method=>:delete, :confirm=>"Are you sure?"
+
+

data/app/views/admin/q/klasses.html.haml

@@ -0,0 +1,61 @@
+- content_for :main do
+
+  %h1.notificationqueue_icon= "Notification Queue '#{@publisher.name}' Classes"
+
+  .link(style='margin: 20px 0;')
+    = icon_to "Notification Queue", "/admin/q/#{@publisher.id}"
+
+  = icon_to_show 'Create', 'create' unless params[:klass_id]
+
+  #create.klass(style="#{'display: none;' unless params[:klass_id]}")
+    = form_for @q_klass, :url=>"/admin/q/#{@publisher.id}/klasses" do |f|
+      = f.hidden_field :id if @q_klass.id
+      %p
+        %label Name:
+        = f.text_field :name
+
+      %p
+        %label Method:
+        = f.select :notification_method, options_for_select(["twitter", "email"])
+
+      %p
+        %label Heading 1 (h1) Code:
+        - @q_klass.h1_code ||= ''
+        = cm_editor('q_klass[h1_code]', {:mode=>'ruby'})
+      %p
+        %label Heading 2 (h2) Code:
+        - @q_klass.h2_code ||= ''
+        = cm_editor('q_klass[h2_code]', {:mode=>'ruby'})
+      %p
+        %label Message Code:
+        - @q_klass.message_code ||= ''
+        = cm_editor('q_klass[message_code]', {:mode=>'ruby'})
+
+      %p
+        = kit_submit "Save"
+
+  - klasses = @publisher.q_klasses.order("id desc").page(params[:page]).per(100)
+  
+  = paginate klasses, :param_name=>:page
+  
+  %table.loosen_more
+    %tr
+      %th Name
+      %th Method
+      %th h1 Code
+      %th h2 Code
+    - klasses.each do |k|
+      %tr
+        %td= link_to k.name, "/admin/q/#{@publisher.id}/klasses/#{k.id}"
+        %td= k.notification_method
+        %td
+          %pre
+            = k.h1_code
+        %td
+          %pre
+            = k.h2_code
+
+
+  = paginate klasses, :param_name=>:page
+
+

data/app/views/admin/q/messages.html.haml

@@ -0,0 +1,37 @@
+- content_for :main do
+
+  %h1.notificationqueue_icon= "Notification Queue '#{@publisher.name}' Sent Notifications"
+
+  .link(style='margin: 20px 0;')
+    = icon_to "Notification Queue", "/admin/q/#{@publisher.id}"
+
+  - sents = @publisher.q_messages.includes([:q_user, :q_event]).order("id desc").page(params[:page]).per(100)
+
+  = paginate sents
+
+  %table.loosen_more
+    %tr
+      %th User
+      %th Status
+      %th Topic 
+      %th Sent
+      %th Destination
+
+      %th Message
+    - sents.each do |s|
+      %tr
+        %td(nowrap)= "#{s.q_user.email} [ #{s.q_user.id} ]"
+        %td(width="150")= s.status
+        %td= s.q_event.topic 
+        %td= time_ago_in_words s.created_at rescue ''
+        %td= s.destination
+        %td
+          = s.h1
+          %br
+          = s.h2
+          %br
+          = field_reveal(s.body, 500)
+
+  = paginate sents
+
+