kit_cms 2.3.9 → 2.3.10

data/app/assets/javascripts/jqueryui.js

@@ -0,0 +1,4 @@
+/*
+ *= require './kit/jquery'
+ *= require './kit/jquery-ui'
+*/

data/app/assets/javascripts/{kit_admin.js → kit/cms.js}

@@ -1,9 +1,10 @@
 /*
  *= require './kit'
- *= require './kit/application-edit'
- *= require './kit/underscore'
- *= require './kit/jquery.contextmenu'
- *= require './kit/tree'
+ *= require './application-edit'
+ *= require '../underscore'
+ *= require '../jquery.contextmenu'
+ *= require '../jquery.fileupload'
+ *= require './tree'
  *= require_self
  */
 

data/app/assets/javascripts/kit/{mercury-editor.js.erb → editor.js}

@@ -23,12 +23,13 @@
  * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR
  * OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  *
+ *= require '../jquery'
+ *= require '../jquery-ui'
+ *= require './utilities'
+ *= require './application-edit'
+ *= require '../codemirror/editor'
  *= require_self
  *
- * Minimum jQuery requirements are 1.7
- *= require jquery
- *= require jquery-ui.min
- *
  * You can include the Rails jQuery ujs script here to get some nicer behaviors in modals, panels and lightviews when
  * using :remote => true within the contents rendered in them.
  * require jquery_ujs

data/app/assets/javascripts/kit/kit.js

@@ -0,0 +1,12 @@
+/* kit.js from within kit */
+/*
+ *= require "../jquery"
+ *= require "../jquery-ui"
+ *= require "../jquery.validate"
+ *= require "../best_in_place"
+ *= require "./markdown"
+ *= require "jquery_ujs"
+ *= require "./utilities.js"
+ */
+
+

data/app/assets/javascripts/kit/utilities.js

@@ -17,21 +17,6 @@ select_change_parent = function(element, child, data, value) {
   $('#' + child).html(op);
 }
 
-var ace_editor = null;
-
-function create_ace_editor(mode, field, content) {
-  ace_editor = ace.edit('editor_body');
-  ace_editor.setTheme("ace/theme/textmate");
-  var editorMode = require("ace/mode/" + mode).Mode;
-  ace_editor.getSession().setMode(new editorMode());
-  ace_editor.getSession().setTabSize(2);
-  ace_editor.setShowPrintMargin(false);
-  ace_editor.getSession().setValue(content);
-
-  $('.cms_form form').on('submit', function() {
-    $('#'+ field).val(ace_editor.getSession().getValue());
-  });
-}
 
 function markup_menu(id) {
   var first_top_level = true;

data/app/assets/stylesheets/codemirror/editor.css

@@ -0,0 +1,6 @@
+/*
+ *= require "./style.css"
+ *= require "./theme.css"
+ *= require "./dialog.css"
+ */
+

data/app/assets/stylesheets/codemirror/style.css

@@ -4,8 +4,8 @@
   /* Set height, width, borders, and global font properties here */
   font-family: monospace;
   height: 800px;
-  font-size: 16px;
-  line-height: 16px;
+  font-size: 15px;
+  line-height: 18px;
 }
 .CodeMirror-scroll {
   /* Set scrolling behaviour here */

data/app/assets/stylesheets/codemirror/theme.css

@@ -2,7 +2,7 @@
 
 .cm-s-blackboard.CodeMirror { background: #0C1021; color: #F8F8F8; }
 .cm-s-blackboard .CodeMirror-selected { background: blue !important;  }
-.cm-s-blackboard .CodeMirror-gutters { background: #0C1021; border-right: 0; }
+.cm-s-blackboard .CodeMirror-gutters { background: #4C5061; border-right: 0; }
 .cm-s-blackboard .CodeMirror-linenumber { color: #888; }
 .cm-s-blackboard .CodeMirror-cursor { border-left: 1px solid #A7A7A7 !important; }
 
@@ -23,3 +23,28 @@
 .cm-s-blackboard .cm-header { color: #FF6400; }
 .cm-s-blackboard .cm-hr { color: #AEAEAE; }
 .cm-s-blackboard .cm-link { color: #8DA6CE; }
+
+.cm-s-blackboard-cms.CodeMirror { width: 740px !important; height: 600px !important; background: #0C1021; color: #F8F8F8; }
+.cm-s-blackboard-cms .CodeMirror-selected { background: blue !important;  }
+.cm-s-blackboard-cms .CodeMirror-gutters { background: #4C5061; border-right: 0; }
+.cm-s-blackboard-cms .CodeMirror-linenumber { color: #888; }
+.cm-s-blackboard-cms .CodeMirror-cursor { border-left: 1px solid #A7A7A7 !important; }
+
+.cm-s-blackboard-cms .cm-keyword { color: #FBDE2D; }
+.cm-s-blackboard-cms .cm-atom { color: #D8FA3C; }
+.cm-s-blackboard-cms .cm-number { color: #D8FA3C; }
+.cm-s-blackboard-cms .cm-def { color: #8DA6CE; }
+.cm-s-blackboard-cms .cm-variable { color: #FF6400; }
+.cm-s-blackboard-cms .cm-operator { color: #FBDE2D;}
+.cm-s-blackboard-cms .cm-comment { color: #AEAEAE; }
+.cm-s-blackboard-cms .cm-string { color: #61CE3C; }
+.cm-s-blackboard-cms .cm-string-2 { color: #61CE3C; }
+.cm-s-blackboard-cms .cm-meta { color: #D8FA3C; }
+.cm-s-blackboard-cms .cm-error { background: #9D1E15; color: #F8F8F8; }
+.cm-s-blackboard-cms .cm-builtin { color: #8DA6CE; }
+.cm-s-blackboard-cms .cm-tag { color: #8DA6CE; }
+.cm-s-blackboard-cms .cm-attribute { color: #8DA6CE; }
+.cm-s-blackboard-cms .cm-header { color: #FF6400; }
+.cm-s-blackboard-cms .cm-hr { color: #AEAEAE; }
+.cm-s-blackboard-cms .cm-link { color: #8DA6CE; }
+

data/app/assets/stylesheets/kit/cms.css

@@ -0,0 +1,35 @@
+/*
+ *= require_tree "./cms"
+ *= require_tree "./ui-lightness"
+ *= require '../codemirror/editor' 
+ *= require "./calendar"
+ *= require "./fancybox"
+*/
+
+.ui-widget {
+  background-color: white;
+  font-family: 'Oxygen', sans-serif, arial, helvetica, sans-serif;
+  font-size:   14px;
+  line-height: 18px;
+}
+
+.ui-widget-header {
+  background-color: #AD3131 !important; 
+  border-color: black;
+  background-image: none;
+}
+
+.ui-dialog {
+  background-color: white;
+}
+
+.ui-dialog-content {
+  padding: 10px;
+}
+
+.ui-dialog-title {
+  background-color: #AD3131 !important; 
+
+}
+
+

data/app/assets/stylesheets/{mercury_editor.css → kit/editor.css}

@@ -1,3 +1,9 @@
+/*
+ *= require_self
+ *= require '../codemirror/editor' 
+ *= require 'mercury' 
+*/
+
 html { -webkit-text-size-adjust: none; }
 
 /* Button example */
@@ -18,6 +24,9 @@ html { -webkit-text-size-adjust: none; }
 .mercury-primary-toolbar .mercury-related-button em  {
   background-image: url(/assets/mercury/related.png);
 }
+.mercury-primary-toolbar .mercury-insertsPanel-button em  {
+  background-image: url(/assets/mercury/insertsPanel.png);
+}
 
 div#mercury_notes {
   width: 300px;

data/app/assets/stylesheets/{kit.css → kit/kit.css}

@@ -1,8 +1,8 @@
 /*
- *= require './kit/forums'
- *= require './kit/calendar'
- *= require './kit/dsc'
- *= require './kit/markdown.css'
+ *= require './forums'
+ *= require './calendar'
+ *= require './dsc'
+ *= require './markdown.css'
  *= require_self
  */
 

data/app/controllers/admin/ad_units_controller.rb

@@ -1,6 +1,6 @@
 class Admin::AdUnitsController < AdminController
 
-  layout 'cms-boxed'
+  layout 'cms'
 
   def create_block
     @ad_unit = AdUnit.find_sys_id(_sid, params[:id])

data/app/controllers/admin/block_controller.rb

@@ -1,6 +1,6 @@
 class Admin::BlockController < AdminController
 
-  layout "cms-boxed"
+  layout "cms"
 
   def index
     @blocks = Block

data/app/controllers/admin/block_instance_controller.rb

@@ -15,7 +15,7 @@ class Admin::BlockInstanceController < AdminController
   end
 
   def show
-    @instance = BlockInstance.where(:page_id=>params[:page_id]).where(:id=>params[:id]).sys(_sid).where(:version=>params[:version] || 0).first
+    @instance = BlockInstance.where(:id=>params[:id]).sys(_sid).where(:version=>params[:version] || 0).first
     if @instance
       @block = @instance.block
       @options = BlockInstance.where(:page_id=>params[:page_id]).where(:version=>@instance.version).where(:instance_id=>@instance.instance_id).sys(_sid).all

data/app/controllers/admin/blocks_controller.rb

@@ -1,5 +1,5 @@
 class Admin::BlocksController < AdminController
-  layout "cms-boxed"
+  layout "cms"
   
   def index
     @blocks = Block.sys(_sid).order(:name)

data/app/controllers/admin/calendar_entries_controller.rb

@@ -2,7 +2,7 @@ class Admin::CalendarEntriesController < AdminController
 
   before_filter { licensed('calendars') }
   
-  layout "cms-boxed"
+  layout "cms"
 
   def sold
     @calendar_entry = CalendarEntry.where(:id=>params[:id]).sys(_sid).first

data/app/controllers/admin/calendars_controller.rb

@@ -1,7 +1,7 @@
 class Admin::CalendarsController < AdminController
   before_filter :licensed
   
-  layout "cms-boxed"
+  layout "cms"
 
 
   def index

data/app/controllers/admin/content_controller.rb

@@ -1,6 +1,6 @@
 class Admin::ContentController < AdminController
 
-  layout 'cms-boxed'
+  layout 'cms'
 
   def match
     @page = Page.where(:id=>params[:id]).sys(_sid).first

data/app/controllers/admin/dashboard_controller.rb

@@ -1,5 +1,5 @@
 class Admin::DashboardController < AdminController
-  layout  "cms-boxed"
+  layout  "cms"
 
   def user_comment
     comment = Comment.sys(_sid).where(:id=>params[:id]).first
@@ -357,10 +357,19 @@ class Admin::DashboardController < AdminController
 
   def reindex
     @@to_search.each do |model|
-      force_class = model.constantize.new
-      eval("#{model}.index.delete") rescue nil
-      eval("#{model}.create_elasticsearch_index")
-      eval("#{model}.import :per_page=>5000")
+      modelk = Kernel.const_get(model)
+
+      modelk.index.delete rescue nil
+      modelk.create_elasticsearch_index
+
+      if params[:slow]
+        modelk.find_each do |record|
+          logger.info "Importing #{model} #{record.id}"
+          modelk.index.store  record
+        end
+      else
+        modelk.import :per_page=>1000
+      end
     end 
 
     flash[:notice] = "Reindex complete"
@@ -419,7 +428,7 @@ class Admin::DashboardController < AdminController
     if request.xhr?
       render :partial=>"activity_list"
     else
-      render "activity", :layout=>"cms-boxed"
+      render "activity", :layout=>"cms"
     end
   end
 

data/app/controllers/admin/forum_controller.rb

@@ -1,7 +1,7 @@
 class Admin::ForumController < AdminController
   before_filter { licensed("forums") }
 
-  layout 'cms-boxed'
+  layout 'cms'
 
 
   def index

data/app/controllers/admin/help_controller.rb

@@ -1,6 +1,6 @@
 class Admin::HelpController < AdminController
 
-  layout 'cms-boxed'
+  layout 'cms'
   def edit
     @help = Help.find(params[:id])
   end

data/app/controllers/admin/mapping_controller.rb

@@ -1,6 +1,6 @@
 class Admin::MappingController < AdminController
 
-  layout "cms-boxed"
+  layout "cms"
 
   def index
     @mappings = Mapping.sys(_sid).where(:hidden=>0).order(:source_url).page(params[:page]).per(20)

data/app/controllers/admin/newsletter_controller.rb

@@ -2,7 +2,7 @@ require 'net/pop'
 require 'net/smtp'
 
 class Admin::NewsletterController < AdminController
-  layout "cms-boxed" 
+  layout "cms" 
   before_filter { licensed("newsletters") }
 
   def email

data/app/controllers/admin/page_template_terms_controller.rb

@@ -1,6 +1,6 @@
 class Admin::PageTemplateTermsController < AdminController
 
-  layout "cms-boxed"
+  layout "cms"
 
   def index
     @page_template_terms = PageTemplateTerm.where(:page_template_id=>params[:page_template_id]).sys(_sid).all

data/app/controllers/admin/page_templates_controller.rb

@@ -1,5 +1,5 @@
 class Admin::PageTemplatesController < AdminController
-  layout "cms-boxed"
+  layout "cms"
  
   def pages
    @page_template = PageTemplate.sys(_sid).where(:id=>params[:id]).first

data/app/controllers/admin/preference_controller.rb

@@ -1,6 +1,6 @@
 class Admin::PreferenceController < AdminController
 
-  layout "cms-boxed"
+  layout "cms"
 
   def index
     @user_link = UserLink.new

data/app/controllers/admin/snippet_controller.rb

@@ -1,6 +1,6 @@
 class Admin::SnippetController < AdminController
 
-  layout "cms-boxed"
+  layout "cms"
 
   def index
     @snippets = Snippet

data/app/controllers/admin/todo_controller.rb

@@ -1,5 +1,5 @@
 class Admin::TodoController < AdminController
-  layout 'cms-boxed'
+  layout 'cms'
 
   def test
     
@@ -21,7 +21,7 @@ class Admin::TodoController < AdminController
     if params[:todo_paginate]
       render :partial=>"/admin/todo/sidebar"
     else
-      render "/admin/todo/search", :layout=>"cms-boxed"    
+      render "/admin/todo/search", :layout=>"cms"    
     end
 
   end