kit_cms 2.3.7 → 2.3.8

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

@@ -0,0 +1,31 @@
+var editor_settings = {
+   nameSpace:       "html", // Useful to prevent multi-instances CSS conflict
+    onShiftEnter:    {keepDefault:false, replaceWith:'<br />\n'},
+    onCtrlEnter:     {keepDefault:false, openWith:'\n<p>', closeWith:'</p>\n'},
+    onTab:           {keepDefault:false, openWith:'     '},
+    markupSet:  [
+        {name:'Heading 1', key:'1', openWith:'<h1(!( class="[![Class]!]")!)>', closeWith:'</h1>', placeHolder:'Your title here...' },
+        {name:'Heading 2', key:'2', openWith:'<h2(!( class="[![Class]!]")!)>', closeWith:'</h2>', placeHolder:'Your title here...' },
+        {name:'Heading 3', key:'3', openWith:'<h3(!( class="[![Class]!]")!)>', closeWith:'</h3>', placeHolder:'Your title here...' },
+        {name:'Heading 4', key:'4', openWith:'<h4(!( class="[![Class]!]")!)>', closeWith:'</h4>', placeHolder:'Your title here...' },
+        {name:'Heading 5', key:'5', openWith:'<h5(!( class="[![Class]!]")!)>', closeWith:'</h5>', placeHolder:'Your title here...' },
+        {name:'Heading 6', key:'6', openWith:'<h6(!( class="[![Class]!]")!)>', closeWith:'</h6>', placeHolder:'Your title here...' },
+        {name:'Paragraph', openWith:'<p(!( class="[![Class]!]")!)>', closeWith:'</p>'  },
+        {separator:'---------------' },
+        {name:'Bold', key:'B', openWith:'<strong>', closeWith:'</strong>' },
+        {name:'Italic', key:'I', openWith:'<em>', closeWith:'</em>'  },
+        {name:'Stroke through', key:'S', openWith:'<del>', closeWith:'</del>' },
+        {separator:'---------------' },
+        {name:'Ul', openWith:'<ul>\n', closeWith:'</ul>\n' },
+        {name:'Ol', openWith:'<ol>\n', closeWith:'</ol>\n' },
+        {name:'Li', openWith:'<li>', closeWith:'</li>' },
+        {separator:'---------------' },
+        {name:'Picture', key:'P', replaceWith:'<img src="[![Source:!:http://]!]" alt="[![Alternative text]!]" />' },
+        {name:'Link', key:'L', openWith:'<a href="[![Link:!:http://]!]"(!( title="[![Title]!]")!)>', closeWith:'</a>', placeHolder:'Your text to link...' },
+        {separator:'---------------' },
+        {name:'Clean', replaceWith:function(h) { return h.selection.replace(/<(.*?)>/g, "") } },
+    ]
+}
+              
+
+

data/app/assets/stylesheets/kit/markitup/html.css

@@ -0,0 +1,59 @@
+/* -------------------------------------------------------------------
+// markItUp!
+// By Jay Salvat - http://markitup.jaysalvat.com/
+// ------------------------------------------------------------------*/
+.html .markItUpButton1 a {
+	background-image:url(images/h1.png); 
+}
+.html .markItUpButton2 a {
+	background-image:url(images/h2.png); 
+}
+.html .markItUpButton3 a {
+	background-image:url(images/h3.png); 
+}
+.html .markItUpButton4 a {
+	background-image:url(images/h4.png); 
+}
+.html .markItUpButton5 a {
+	background-image:url(images/h5.png); 
+}
+.html .markItUpButton6 a {
+	background-image:url(images/h6.png); 
+}
+.html .markItUpButton7 a {
+	background-image:url(images/paragraph.png); 
+}
+
+.html .markItUpButton8 a {
+	background-image:url(images/bold.png);
+}
+.html .markItUpButton9 a {
+	background-image:url(images/italic.png);
+}
+.html .markItUpButton10 a {
+	background-image:url(images/stroke.png);
+}
+
+.html .markItUpButton11 a {
+	background-image:url(images/list-bullet.png);
+}
+.html .markItUpButton12 a {
+	background-image:url(images/list-numeric.png);
+}
+.html .markItUpButton13 a {
+	background-image:url(images/list-item.png);
+}
+
+.html .markItUpButton14 a {
+	background-image:url(images/picture.png); 
+}
+.html .markItUpButton15 a {
+	background-image:url(images/link.png);
+}
+
+.html .markItUpButton16 a {
+	background-image:url(images/clean.png);
+}
+.html .preview a {
+	background-image:url(images/preview.png);
+}

data/app/assets/stylesheets/kit/markitup/style.css

@@ -0,0 +1,145 @@
+/* -------------------------------------------------------------------
+// markItUp! Universal MarkUp Engine, JQuery plugin
+// By Jay Salvat - http://markitup.jaysalvat.com/
+// ------------------------------------------------------------------*/
+.markItUp * {
+	margin:0px; padding:0px;
+	outline:none;
+}
+.markItUp a:link,
+.markItUp a:visited {
+	color:#000;
+	text-decoration:none;
+}
+.markItUp  {
+	width:900px;
+	margin:5px 0 5px 0;
+	border:5px solid #F5F5F5;	
+}
+.markItUpContainer  {
+	border:1px solid #3C769D;	
+	background:#FFF url(images/bg-container.png) repeat-x top left;
+	padding:5px 5px 2px 5px;
+	font:11px Verdana, Arial, Helvetica, sans-serif;
+}
+.markItUpEditor {
+	font:12px 'Courier New', Courier, monospace;
+	padding:5px 5px 5px 35px;
+	border:3px solid #3C769D;
+	width:643px;
+	height:320px;
+	clear:both;
+	line-height:18px;
+	overflow:auto;
+}
+.markItUpPreviewFrame	{
+	overflow:auto;
+	background-color:#FFFFFF;
+	border:1px solid #3C769D;
+	width:99.9%;
+	height:300px;
+	margin:5px 0;
+}
+.markItUpFooter {
+	width:100%;
+	cursor:n-resize;
+}
+.markItUpResizeHandle {
+	overflow:hidden;
+	width:22px; height:5px;
+	margin-left:auto;
+	margin-right:auto;
+	background-image:url(images/handle.png);
+	cursor:n-resize;
+}
+/***************************************************************************************/
+/* first row of buttons */
+.markItUpHeader ul li	{
+	list-style:none;
+	float:left;
+	position:relative;
+}
+.markItUpHeader ul li ul{
+	display:none;
+}
+.markItUpHeader ul li:hover > ul{
+	display:block;
+}
+.markItUpHeader ul .markItUpDropMenu {
+	background:transparent url(images/menu.png) no-repeat 115% 50%;
+	margin-right:5px;
+}
+.markItUpHeader ul .markItUpDropMenu li {
+	margin-right:0px;
+}
+.markItUpHeader ul .markItUpSeparator {
+	margin:0 10px;
+	width:1px;
+	height:16px;
+	overflow:hidden;
+	background-color:#CCC;
+}
+.markItUpHeader ul ul .markItUpSeparator {
+	width:auto; height:1px;
+	margin:0px;
+}
+/* next rows of buttons */
+.markItUpHeader ul ul {
+	display:none;
+	position:absolute;
+	top:18px; left:0px;	
+	background:#F5F5F5;
+	border:1px solid #3C769D;
+	height:inherit;
+}
+.markItUpHeader ul ul li {
+	float:none;
+	border-bottom:1px solid #3C769D;
+}
+.markItUpHeader ul ul .markItUpDropMenu {
+	background:#F5F5F5 url(images/submenu.png) no-repeat 100% 50%;
+}
+/* next rows of buttons */
+.markItUpHeader ul ul ul {
+	position:absolute;
+	top:-1px; left:150px;
+}
+.markItUpHeader ul ul ul li {
+	float:none;
+}
+.markItUpHeader ul a {
+	display:block;
+	width:16px; height:16px;
+	text-indent:-10000px;
+	background-repeat:no-repeat;
+	padding:3px;
+	margin:0px;
+}
+.markItUpHeader ul ul a {
+	display:block;
+	padding-left:0px;
+	text-indent:0;
+	width:120px; 
+	padding:5px 5px 5px 25px;
+	background-position:2px 50%;
+}
+.markItUpHeader ul ul a:hover  {
+	color:#FFF;
+	background-color:#3C769D;
+}
+/***************************************************************************************/
+.html .markItUpEditor {
+}
+.markdown .markItUpEditor {
+	background-image:url(images/bg-editor-markdown.png);
+}
+.textile .markItUpEditor {
+	background-image:url(images/bg-editor-textile.png);
+}
+.bbcode .markItUpEditor {
+	background-image:url(images/bg-editor-bbcode.png);
+}
+.wiki .markItUpEditor,
+.dotclear .markItUpEditor {
+	background-image:url(images/bg-editor-wiki.png);
+}

data/app/views/layouts/mercury-editor.html.erb

@@ -13,6 +13,11 @@
       <%= javascript_include_tag 'kit/mercury-editor' %>
       <%= javascript_include_tag 'kit/utilities.js' %>
       <%= javascript_include_tag 'kit/application-edit' %>
+      <%= javascript_include_tag "kit/markitup/jquery.markitup" %>
+      <%= javascript_include_tag "kit/markitup/settings" %>
+      <%= stylesheet_link_tag 'kit/markitup/style.css' %>
+      <%= stylesheet_link_tag 'kit/markitup/html.css' %>
+
     </head>
     <body>
     <script type="text/javascript">

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

@@ -1,6 +1,6 @@
-<script type='text/javascript' src='/javascripts/ace/ace.js'></script>
-<script type='text/javascript' src='/javascripts/ace/theme-textmate.js'></script>
-<script type='text/javascript' src='/javascripts/ace/mode-<%= mode %>.js'></script>
+<%= javascript_include_tag 'kit/ace/ace.js' %>
+<%= javascript_include_tag 'kit/ace/theme-textmate.js' %>
+<%= javascript_include_tag "kit/ace/mode-#{ mode }.js" %>
 
 <script type="text/javascript">
   $(document).ready(function() {

data/app/views/utility/_mercury_html_setup.js.erb

@@ -0,0 +1 @@
+NOT USED

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

@@ -1,7 +1,5 @@
-
-%form(id="mercury_html_editor" style="width:900px")
-
-  %textarea(class="mercury-display-pane-container" id='edit' rows="5" style="width:100%" style="position: relative;")
+%form(id="mercury_html_editor" style="width:900px;")
+  %textarea(class="mercury-display-pane-container" id='edit' )
 
   .mercury-display-controls
     %fieldset(class="buttons")
@@ -9,3 +7,8 @@
         %li(class="commit button")
           %input(class="submit" name="commit" type="submit" value="Save and Replace")
 
+%script(type='text/javascript')
+  $(document).ready(function() {
+  parent.$('#edit').markItUp(parent.editor_settings).css('height', '300px');
+  });
+

data/lib/kit_cms/version.rb

@@ -1,3 +1,3 @@
 module KitCms
-  VERSION = "2.3.7"
+  VERSION = "2.3.8"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: kit_cms
 version: !ruby/object:Gem::Version
-  version: 2.3.7
+  version: 2.3.8
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-01-18 00:00:00.000000000 Z
+date: 2013-01-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -59,22 +59,6 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: kiteditor
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: tire
   requirement: !ruby/object:Gem::Requirement
@@ -491,6 +475,22 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: dynamic_form
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Kit is DSC's Community and Content Management System (CCMS) built as
   a Rails engine for Rails 3.1 and above. It provides an entire application's worth
   of CMS functions including in-place WYSIWYG editing with versioning, flexible layouts
@@ -2383,6 +2383,104 @@ files:
 - app/assets/javascripts/admin/kit_engagement.js
 - app/assets/javascripts/admin/order.js
 - app/assets/javascripts/application.js
+- app/assets/javascripts/kit/ace/ace.js
+- app/assets/javascripts/kit/ace/ext-static_highlight.js
+- app/assets/javascripts/kit/ace/ext-textarea.js
+- app/assets/javascripts/kit/ace/keybinding-emacs.js
+- app/assets/javascripts/kit/ace/keybinding-vim.js
+- app/assets/javascripts/kit/ace/mode-abap.js
+- app/assets/javascripts/kit/ace/mode-asciidoc.js
+- app/assets/javascripts/kit/ace/mode-c9search.js
+- app/assets/javascripts/kit/ace/mode-c_cpp.js
+- app/assets/javascripts/kit/ace/mode-clojure.js
+- app/assets/javascripts/kit/ace/mode-coffee.js
+- app/assets/javascripts/kit/ace/mode-coldfusion.js
+- app/assets/javascripts/kit/ace/mode-csharp.js
+- app/assets/javascripts/kit/ace/mode-css.js
+- app/assets/javascripts/kit/ace/mode-dart.js
+- app/assets/javascripts/kit/ace/mode-diff.js
+- app/assets/javascripts/kit/ace/mode-dot.js
+- app/assets/javascripts/kit/ace/mode-glsl.js
+- app/assets/javascripts/kit/ace/mode-golang.js
+- app/assets/javascripts/kit/ace/mode-groovy.js
+- app/assets/javascripts/kit/ace/mode-haml.js
+- app/assets/javascripts/kit/ace/mode-haxe.js
+- app/assets/javascripts/kit/ace/mode-html.js
+- app/assets/javascripts/kit/ace/mode-jade.js
+- app/assets/javascripts/kit/ace/mode-java.js
+- app/assets/javascripts/kit/ace/mode-javascript.js
+- app/assets/javascripts/kit/ace/mode-json.js
+- app/assets/javascripts/kit/ace/mode-jsp.js
+- app/assets/javascripts/kit/ace/mode-jsx.js
+- app/assets/javascripts/kit/ace/mode-latex.js
+- app/assets/javascripts/kit/ace/mode-less.js
+- app/assets/javascripts/kit/ace/mode-liquid.js
+- app/assets/javascripts/kit/ace/mode-lisp.js
+- app/assets/javascripts/kit/ace/mode-lua.js
+- app/assets/javascripts/kit/ace/mode-luapage.js
+- app/assets/javascripts/kit/ace/mode-lucene.js
+- app/assets/javascripts/kit/ace/mode-makefile.js
+- app/assets/javascripts/kit/ace/mode-markdown.js
+- app/assets/javascripts/kit/ace/mode-objectivec.js
+- app/assets/javascripts/kit/ace/mode-ocaml.js
+- app/assets/javascripts/kit/ace/mode-perl.js
+- app/assets/javascripts/kit/ace/mode-pgsql.js
+- app/assets/javascripts/kit/ace/mode-php.js
+- app/assets/javascripts/kit/ace/mode-powershell.js
+- app/assets/javascripts/kit/ace/mode-python.js
+- app/assets/javascripts/kit/ace/mode-r.js
+- app/assets/javascripts/kit/ace/mode-rdoc.js
+- app/assets/javascripts/kit/ace/mode-rhtml.js
+- app/assets/javascripts/kit/ace/mode-ruby.js
+- app/assets/javascripts/kit/ace/mode-sass.js
+- app/assets/javascripts/kit/ace/mode-scad.js
+- app/assets/javascripts/kit/ace/mode-scala.js
+- app/assets/javascripts/kit/ace/mode-scss.js
+- app/assets/javascripts/kit/ace/mode-sh.js
+- app/assets/javascripts/kit/ace/mode-sql.js
+- app/assets/javascripts/kit/ace/mode-stylus.js
+- app/assets/javascripts/kit/ace/mode-svg.js
+- app/assets/javascripts/kit/ace/mode-tcl.js
+- app/assets/javascripts/kit/ace/mode-text.js
+- app/assets/javascripts/kit/ace/mode-textile.js
+- app/assets/javascripts/kit/ace/mode-typescript.js
+- app/assets/javascripts/kit/ace/mode-xml.js
+- app/assets/javascripts/kit/ace/mode-xquery.js
+- app/assets/javascripts/kit/ace/mode-yaml.js
+- app/assets/javascripts/kit/ace/theme-ambiance.js
+- app/assets/javascripts/kit/ace/theme-chaos.js
+- app/assets/javascripts/kit/ace/theme-chrome.js
+- app/assets/javascripts/kit/ace/theme-clouds.js
+- app/assets/javascripts/kit/ace/theme-clouds_midnight.js
+- app/assets/javascripts/kit/ace/theme-cobalt.js
+- app/assets/javascripts/kit/ace/theme-crimson_editor.js
+- app/assets/javascripts/kit/ace/theme-dawn.js
+- app/assets/javascripts/kit/ace/theme-dreamweaver.js
+- app/assets/javascripts/kit/ace/theme-eclipse.js
+- app/assets/javascripts/kit/ace/theme-github.js
+- app/assets/javascripts/kit/ace/theme-idle_fingers.js
+- app/assets/javascripts/kit/ace/theme-kr.js
+- app/assets/javascripts/kit/ace/theme-merbivore.js
+- app/assets/javascripts/kit/ace/theme-merbivore_soft.js
+- app/assets/javascripts/kit/ace/theme-mono_industrial.js
+- app/assets/javascripts/kit/ace/theme-monokai.js
+- app/assets/javascripts/kit/ace/theme-pastel_on_dark.js
+- app/assets/javascripts/kit/ace/theme-solarized_dark.js
+- app/assets/javascripts/kit/ace/theme-solarized_light.js
+- app/assets/javascripts/kit/ace/theme-textmate.js
+- app/assets/javascripts/kit/ace/theme-tomorrow.js
+- app/assets/javascripts/kit/ace/theme-tomorrow_night.js
+- app/assets/javascripts/kit/ace/theme-tomorrow_night_blue.js
+- app/assets/javascripts/kit/ace/theme-tomorrow_night_bright.js
+- app/assets/javascripts/kit/ace/theme-tomorrow_night_eighties.js
+- app/assets/javascripts/kit/ace/theme-twilight.js
+- app/assets/javascripts/kit/ace/theme-vibrant_ink.js
+- app/assets/javascripts/kit/ace/theme-xcode.js
+- app/assets/javascripts/kit/ace/worker-coffee.js
+- app/assets/javascripts/kit/ace/worker-css.js
+- app/assets/javascripts/kit/ace/worker-javascript.js
+- app/assets/javascripts/kit/ace/worker-json.js
+- app/assets/javascripts/kit/ace/worker-xquery.js
 - app/assets/javascripts/kit/application-edit.js
 - app/assets/javascripts/kit/application.js
 - app/assets/javascripts/kit/best_in_place.js
@@ -2438,6 +2536,8 @@ files:
 - app/assets/javascripts/kit/jquery.validate.js
 - app/assets/javascripts/kit/jsplumb-min.js
 - app/assets/javascripts/kit/markdown.js
+- app/assets/javascripts/kit/markitup/jquery.markitup.js
+- app/assets/javascripts/kit/markitup/settings.js
 - app/assets/javascripts/kit/mercury-editor.js.erb
 - app/assets/javascripts/kit/messaging.js
 - app/assets/javascripts/kit/rails_admin/application.js
@@ -2515,6 +2615,39 @@ files:
 - app/assets/stylesheets/kit/fancybox.css
 - app/assets/stylesheets/kit/forums.css
 - app/assets/stylesheets/kit/markdown.css
+- app/assets/stylesheets/kit/markitup/html.css
+- app/assets/stylesheets/kit/markitup/images/bg-container.png
+- app/assets/stylesheets/kit/markitup/images/bg-editor-bbcode.png
+- app/assets/stylesheets/kit/markitup/images/bg-editor-dotclear.png
+- app/assets/stylesheets/kit/markitup/images/bg-editor-html.png
+- app/assets/stylesheets/kit/markitup/images/bg-editor-json.png
+- app/assets/stylesheets/kit/markitup/images/bg-editor-markdown.png
+- app/assets/stylesheets/kit/markitup/images/bg-editor-textile.png
+- app/assets/stylesheets/kit/markitup/images/bg-editor-wiki.png
+- app/assets/stylesheets/kit/markitup/images/bg-editor-xml.png
+- app/assets/stylesheets/kit/markitup/images/bg-editor.png
+- app/assets/stylesheets/kit/markitup/images/bold.png
+- app/assets/stylesheets/kit/markitup/images/clean.png
+- app/assets/stylesheets/kit/markitup/images/h1.png
+- app/assets/stylesheets/kit/markitup/images/h2.png
+- app/assets/stylesheets/kit/markitup/images/h3.png
+- app/assets/stylesheets/kit/markitup/images/h4.png
+- app/assets/stylesheets/kit/markitup/images/h5.png
+- app/assets/stylesheets/kit/markitup/images/h6.png
+- app/assets/stylesheets/kit/markitup/images/handle.png
+- app/assets/stylesheets/kit/markitup/images/image.png
+- app/assets/stylesheets/kit/markitup/images/italic.png
+- app/assets/stylesheets/kit/markitup/images/link.png
+- app/assets/stylesheets/kit/markitup/images/list-bullet.png
+- app/assets/stylesheets/kit/markitup/images/list-item.png
+- app/assets/stylesheets/kit/markitup/images/list-numeric.png
+- app/assets/stylesheets/kit/markitup/images/menu.png
+- app/assets/stylesheets/kit/markitup/images/paragraph.png
+- app/assets/stylesheets/kit/markitup/images/picture.png
+- app/assets/stylesheets/kit/markitup/images/preview.png
+- app/assets/stylesheets/kit/markitup/images/stroke.png
+- app/assets/stylesheets/kit/markitup/images/submenu.png
+- app/assets/stylesheets/kit/markitup/style.css
 - app/assets/stylesheets/kit/rails_admin/aristo/images/bg_fallback.png
 - app/assets/stylesheets/kit/rails_admin/aristo/images/icon_sprite.png
 - app/assets/stylesheets/kit/rails_admin/aristo/images/progress_bar.gif
@@ -3215,6 +3348,7 @@ files:
 - app/views/utility/_fetch_rss.html.erb
 - app/views/utility/_map.html.haml
 - app/views/utility/_menu.html.haml
+- app/views/utility/_mercury_html_setup.js.erb
 - app/views/utility/_search_form.html.erb
 - app/views/utility/_tinymce.html.erb
 - app/views/utility/design_history.html.haml