knitkit 2.0.5 → 2.0.6

data/public/javascripts/knitkit/inline_editing.js

@@ -0,0 +1,136 @@
+Knitkit.InlineEditing = {
+    contentDiv:null,
+    websiteId:null,
+    contentId:null,
+
+    closeEditor:function (editor) {
+        editor.destroy();
+        jQuery('#editableContentContainer').remove();
+        jQuery('#editableContentOverlay').remove();
+    },
+
+    saved:function (editor, result, status, xhr) {
+        if (result.success === true) {
+            this.closeEditor(editor);
+        }
+        else {
+            jQuery('#inlineEditSaveResult').html(" Could not update.  Please try again.");
+        }
+    },
+
+    error:function (xhr, status, error) {
+        jQuery('#inlineEditSaveResult').html(" Could not update.  Please try again.");
+    },
+
+    closeEditorClick:function () {
+        //make sure modal is not already showing
+        if ($("#warning-modal").length === 0) {
+            var editor = CKEDITOR.instances['inlineEditTextarea'];
+            if (editor.checkDirty()) {
+                jQuery('#editableContentOverlay').css('z-index','1003');
+
+                var warningModal = jQuery("<div id='warning-modal'></div>");
+                warningModal.append('<span>You have unsaved changes. Are you sure you want to exit?</span><br/><br/>');
+
+                var noBtn = jQuery('<input class="warning-btn" type="button" value="No" />');
+                noBtn.bind('click', function () {
+                    warningModal.remove();
+                    jQuery('#editableContentOverlay').css('z-index','1001');
+                });
+
+                var yesBtn = jQuery('<input class="warning-btn" type="button" value="Yes" />');
+                yesBtn.bind('click', function () {
+                    Knitkit.InlineEditing.closeEditor(editor);
+                    warningModal.remove();
+                });
+
+                warningModal.append(noBtn);
+                warningModal.append(yesBtn);
+                jQuery("body").append(warningModal);
+            }
+            else {
+                Knitkit.InlineEditing.closeEditor(editor);
+            }
+        }
+        return false;
+    },
+
+    setup:function (websiteId) {
+        this.websiteId = websiteId;
+
+        jQuery('div.knitkit_content').bind('mouseenter', function () {
+            var div = jQuery(this);
+            div.addClass('knitkit-inlineedit-editable');
+        });
+
+        jQuery('div.knitkit_content').bind('mouseleave', function () {
+            var div = jQuery(this);
+            div.removeClass('knitkit-inlineedit-editable');
+        });
+
+        jQuery('div.knitkit_content').bind('click', function () {
+            var self = Knitkit.InlineEditing;
+            var div = jQuery(this);
+            self.contentId = div.attr('contentid');
+            self.lastUpdate = div.attr('lastupdate');
+            var data = div.html();
+
+            var textarea = jQuery('<textarea name="inline-edit-textarea" id="inlineEditTextarea" ></textarea>');
+            var closeLink = jQuery("<a class='inline-edit-close'><img src='images/knitkit/close.png' /></a>");
+            var messageSpan = jQuery("<span class='inline-edit-message' id='inlineEditMessage'>Last Update: <span id='inlineEditLastUpdate'>" + self.lastUpdate + "</span><span id='inlineEditSaveResult'></span></span>");
+
+            var editableContentContainer = jQuery("<div id='editableContentContainer' class='modal-container'></div>");
+            var ckeditorWrapper = jQuery("<div class='ckeditor_wrapper'></div>");
+            var actionResultDiv = jQuery("<div class='editable-content-actionresult'></div>");
+
+            editableContentContainer.append(ckeditorWrapper);
+            ckeditorWrapper.append(textarea);
+            editableContentContainer.append(actionResultDiv);
+            actionResultDiv.append(closeLink);
+            actionResultDiv.append(messageSpan);
+
+            var overlay = jQuery("<div id='editableContentOverlay' class='modal-overlay'></div>");
+
+            jQuery("body").append(editableContentContainer);
+            jQuery("body").append(overlay);
+
+            closeLink.bind('click', self.closeEditorClick);
+
+            CKEDITOR.replace('inline-edit-textarea',
+                {
+                    height:320,
+                    enterMode:CKEDITOR.ENTER_BR,
+                    extraPlugins:'inlineeditsave,jwplayer',
+                    toolbar:[
+                        { name:'document', items:[ 'Source', '-', 'InlineEditSave', 'NewPage', 'DocProps', 'Preview', 'Print', '-', 'Templates' ] },
+                        { name:'clipboard', items:[ 'Cut', 'Copy', 'Paste', 'PasteText', 'PasteFromWord', '-', 'Undo', 'Redo' ] },
+                        { name:'editing', items:[ 'Find', 'Replace', '-', 'SelectAll', '-', 'SpellChecker', 'Scayt' ] },
+                        { name:'forms', items:[ 'Form', 'Checkbox', 'Radio', 'TextField', 'Textarea', 'Select', 'Button', 'ImageButton',
+                            'HiddenField' ] },
+                        '/',
+                        { name:'basicstyles', items:[ 'Bold', 'Italic', 'Underline', 'Strike', 'Subscript', 'Superscript', '-', 'RemoveFormat' ] },
+                        { name:'paragraph', items:[ 'NumberedList', 'BulletedList', '-', 'Outdent', 'Indent', '-', 'Blockquote', 'CreateDiv',
+                            '-', 'JustifyLeft', 'JustifyCenter', 'JustifyRight', 'JustifyBlock', '-', 'BidiLtr', 'BidiRtl' ] },
+                        { name:'links', items:[ 'Link', 'Unlink', 'Anchor' ] },
+                        { name:'insert', items:[ 'Image', 'Flash', 'jwplayer', 'Table', 'HorizontalRule', 'Smiley', 'SpecialChar', 'PageBreak', 'Iframe' ] },
+                        '/',
+                        { name:'styles', items:[ 'Styles', 'Format', 'Font', 'FontSize' ] },
+                        { name:'colors', items:[ 'TextColor', 'BGColor' ] },
+                        { name:'tools', items:[ 'Maximize', 'ShowBlocks', '-', 'About' ] }
+                    ],
+                    on:{
+                        instanceReady:function (ev) {
+                            Knitkit.InlineEditing.contentDiv = div;
+                            this.setData(data);
+                            this.focus();
+                        },
+                        dataReady:function (ev) {
+                            this.resetDirty();
+                        }
+                    }
+
+                });
+
+        });
+    }
+}

data/public/stylesheets/extjs/resources/css/knitkit_extjs_4.css

@@ -76,9 +76,8 @@
 	padding:1px 3px;
 }
 
-
 /* this corrects a rendering issue */
-.x-border-box .x-reset,.x-border-box .x-reset *
+.x-panel, .x-panel-header, #main, #menu *, #site_content, #footer
 {
 	-moz-box-sizing:content-box;
 	-ms-box-sizing:content-box;

data/public/stylesheets/knitkit/inline_editing.css

@@ -0,0 +1,88 @@
+/* inline editing */
+
+/*hightlight editable areas*/
+div.knitkit-inlineedit-editable{
+    -moz-box-shadow:    3px 3px 5px 6px #ccc;
+    -webkit-box-shadow: 3px 3px 5px 6px #ccc;
+    box-shadow:         3px 3px 5px 6px #ccc;
+    cursor: pointer;
+}
+
+a.inline-edit-close{
+    float:right;
+    cursor:pointer;
+}
+
+span.inline-edit-message{
+    float:left;
+    font-weight: bold;
+    line-height: 1em;
+    color:#CCC;
+    font-size:16px;
+}
+
+div.editable-content-actionresult{
+    padding-top:5px;
+}
+
+/*simple overlay*/
+div.modal-container{
+    position: absolute;
+    top: 12.5%;
+    left: 12.5%;
+    width: 75%;
+    height: 600px;
+    z-index: 1002;
+    overflow: auto;
+}
+
+/*warning modal*/
+#warning-modal{
+    z-index:1003;
+    background-color:white;
+    border:solid 5px #025587;
+    position: absolute;
+    top:40%;
+    left:35%;
+    width: 455px;
+    height: 55px;
+    overflow: auto;
+    padding: 10px;
+    text-align: center;
+}
+
+#warning-modal span{
+    font: 100% arial;
+}
+
+.warning-btn{
+    font: 100% arial;
+    border: 1px solid;
+    width: 60px;
+    height: 15px;
+    padding: 2px 0 3px 0;
+    cursor: pointer;
+    background: #263C56;
+    color: white;
+}
+
+/*warning modal*/
+
+div.ckeditor_wrapper{
+    background-color: #F0EFE2;
+    padding:10px;
+}
+
+.modal-overlay{
+    position: absolute;
+    top: 0%;
+    left: 0%;
+    width: 100%;
+    height: 100%;
+    background-color: black;
+    z-index:1001;
+    -moz-opacity: 0.8;
+    opacity:.80;
+    filter: alpha(opacity=80);
+}
+/* end inline editing */

data/public/stylesheets/knitkit/style.css

@@ -413,4 +413,4 @@ ul#side_menu li a:hover, ul#side_menu li.selected a, ul#side_menu li.selected a:
 
 a.tooltip {text-decoration:none;}
 a.tooltip span {display:none; padding:2px 3px; margin-left:8px; width:130px;}
-a.tooltip:hover span{display:inline; position:absolute; border:1px solid #cccccc; background:#ffffff; color:#6c6c6c;}
+a.tooltip:hover span{display:inline; position:absolute; border:1px solid #cccccc; background:#ffffff; color:#6c6c6c;}

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: knitkit
 version: !ruby/object:Gem::Version
-  version: 2.0.5
+  version: 2.0.6
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-07-16 00:00:00.000000000 Z
+date: 2012-09-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: erp_forms
-  requirement: &70273546131000 !ruby/object:Gem::Requirement
+  requirement: &70185626430400 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: '2.0'
   type: :runtime
   prerelease: false
-  version_requirements: *70273546131000
+  version_requirements: *70185626430400
 - !ruby/object:Gem::Dependency
   name: erp_dev_svcs
-  requirement: &70273546129440 !ruby/object:Gem::Requirement
+  requirement: &70185626429740 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +32,10 @@ dependencies:
         version: '3.0'
   type: :development
   prerelease: false
-  version_requirements: *70273546129440
+  version_requirements: *70185626429740
 - !ruby/object:Gem::Dependency
   name: routing-filter
-  requirement: &70273546127160 !ruby/object:Gem::Requirement
+  requirement: &70185626428880 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
@@ -43,10 +43,10 @@ dependencies:
         version: 0.2.4
   type: :runtime
   prerelease: false
-  version_requirements: *70273546127160
+  version_requirements: *70185626428880
 - !ruby/object:Gem::Dependency
   name: nokogiri
-  requirement: &70273546124700 !ruby/object:Gem::Requirement
+  requirement: &70185626428320 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,10 +54,10 @@ dependencies:
         version: 1.5.0
   type: :runtime
   prerelease: false
-  version_requirements: *70273546124700
+  version_requirements: *70185626428320
 - !ruby/object:Gem::Dependency
   name: rubyzip
-  requirement: &70273546123400 !ruby/object:Gem::Requirement
+  requirement: &70185626427640 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
@@ -65,10 +65,10 @@ dependencies:
         version: 0.9.4
   type: :runtime
   prerelease: false
-  version_requirements: *70273546123400
+  version_requirements: *70185626427640
 - !ruby/object:Gem::Dependency
   name: railties
-  requirement: &70273546105440 !ruby/object:Gem::Requirement
+  requirement: &70185626426500 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -76,10 +76,10 @@ dependencies:
         version: 3.1.0
   type: :runtime
   prerelease: false
-  version_requirements: *70273546105440
+  version_requirements: *70185626426500
 - !ruby/object:Gem::Dependency
   name: actionmailer
-  requirement: &70273546104960 !ruby/object:Gem::Requirement
+  requirement: &70185626425160 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -87,10 +87,10 @@ dependencies:
         version: 3.1.0
   type: :runtime
   prerelease: false
-  version_requirements: *70273546104960
+  version_requirements: *70185626425160
 - !ruby/object:Gem::Dependency
   name: actionpack
-  requirement: &70273546104480 !ruby/object:Gem::Requirement
+  requirement: &70185626424540 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -98,10 +98,10 @@ dependencies:
         version: 3.1.0
   type: :runtime
   prerelease: false
-  version_requirements: *70273546104480
+  version_requirements: *70185626424540
 - !ruby/object:Gem::Dependency
   name: activerecord
-  requirement: &70273546104020 !ruby/object:Gem::Requirement
+  requirement: &70185626423680 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -109,10 +109,10 @@ dependencies:
         version: 3.1.0
   type: :runtime
   prerelease: false
-  version_requirements: *70273546104020
+  version_requirements: *70185626423680
 - !ruby/object:Gem::Dependency
   name: activeresource
-  requirement: &70273546103560 !ruby/object:Gem::Requirement
+  requirement: &70185626422240 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -120,10 +120,10 @@ dependencies:
         version: 3.1.0
   type: :runtime
   prerelease: false
-  version_requirements: *70273546103560
+  version_requirements: *70185626422240
 - !ruby/object:Gem::Dependency
   name: activesupport
-  requirement: &70273546103100 !ruby/object:Gem::Requirement
+  requirement: &70185626421500 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -131,10 +131,10 @@ dependencies:
         version: 3.1.0
   type: :runtime
   prerelease: false
-  version_requirements: *70273546103100
+  version_requirements: *70185626421500
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &70273546102640 !ruby/object:Gem::Requirement
+  requirement: &70185626420720 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -142,10 +142,10 @@ dependencies:
         version: 3.1.0
   type: :runtime
   prerelease: false
-  version_requirements: *70273546102640
+  version_requirements: *70185626420720
 - !ruby/object:Gem::Dependency
   name: acts-as-taggable-on
-  requirement: &70273546102180 !ruby/object:Gem::Requirement
+  requirement: &70185626419700 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
@@ -153,7 +153,7 @@ dependencies:
         version: 2.1.1
   type: :runtime
   prerelease: false
-  version_requirements: *70273546102180
+  version_requirements: *70185626419700
 description: Knitkit is CompassAE's content and digital asset management application.
   It is based on ideas and code adapted from Mephisto and adva_cms, with significant
   changes to integrate with the CompassAE object-relational layer and to harmonize
@@ -167,6 +167,7 @@ files:
 - public/images/check.png
 - public/images/credit_card.png
 - public/images/knitkit/bullet.png
+- public/images/knitkit/close.png
 - public/images/knitkit/content.png
 - public/images/knitkit/footer.png
 - public/images/knitkit/graphic.png
@@ -193,13 +194,21 @@ files:
 - public/javascripts/erp_app/desktop/applications/knitkit/section_articles_grid_panel.js
 - public/javascripts/erp_app/desktop/applications/knitkit/themes_tree_panel.js
 - public/javascripts/erp_app/desktop/applications/knitkit/versions_grid_panel.js
-- public/javascripts/erp_app/desktop/applications/knitkit/west_region.js
+- public/javascripts/erp_app/desktop/applications/knitkit/west_region/helpers/document.js
+- public/javascripts/erp_app/desktop/applications/knitkit/west_region/helpers/host.js
+- public/javascripts/erp_app/desktop/applications/knitkit/west_region/helpers/menu.js
+- public/javascripts/erp_app/desktop/applications/knitkit/west_region/helpers/section.js
+- public/javascripts/erp_app/desktop/applications/knitkit/west_region/helpers/website.js
+- public/javascripts/erp_app/desktop/applications/knitkit/west_region/helpers/website_nav_items.js
+- public/javascripts/erp_app/desktop/applications/knitkit/west_region/west_region.js
 - public/javascripts/erp_app/desktop/applications/knitkit/widgets_panel.js
 - public/javascripts/knitkit/helpers.js
+- public/javascripts/knitkit/inline_editing.js
 - public/stylesheets/datepicker.css
 - public/stylesheets/erp_app/desktop/applications/knitkit/knitkit.css
 - public/stylesheets/extjs/resources/css/knitkit_extjs_4.css
 - public/stylesheets/knitkit/documentation.css
+- public/stylesheets/knitkit/inline_editing.css
 - public/stylesheets/knitkit/style.css
 - app/assets/javascripts/knitkit/application.js
 - app/assets/stylesheets/knitkit/application.css
@@ -225,6 +234,7 @@ files:
 - app/controllers/knitkit/website_sections_controller.rb
 - app/helpers/application_helper.rb
 - app/mailers/document_mailer.rb
+- app/mailers/website_inquiry_mailer.rb
 - app/models/article.rb
 - app/models/blog.rb
 - app/models/comment.rb
@@ -244,7 +254,6 @@ files:
 - app/models/website.rb
 - app/models/website_host.rb
 - app/models/website_inquiry.rb
-- app/models/website_inquiry_mailer.rb
 - app/models/website_nav.rb
 - app/models/website_nav_item.rb
 - app/models/website_party_role.rb
@@ -327,6 +336,7 @@ files:
 - db/data_migrations/20120127150505_create_website_default_configuration.rb
 - db/data_migrations/20120127150506_add_primary_host_to_website_configuration.rb
 - db/data_migrations/20120316150424_add_is_template_to_default_website_config.rb
+- db/data_migrations/20120809020508_update_website_and_configuration.rb
 - db/data_migrations/upgrade/20111011203718_create_paths_for_sections.rb
 - db/data_migrations/upgrade/20111216192114_add_secured_models_to_menu_items.rb
 - db/data_migrations/upgrade/20111216202819_set_contents_iid_to_permalink_where_null.rb
@@ -348,13 +358,19 @@ files:
 - lib/knitkit/config.rb
 - lib/knitkit/engine.rb
 - lib/knitkit/extensions/action_controller/theme_support/acts_as_themed_controller.rb
+- lib/knitkit/extensions/action_mailer/theme_support/acts_as_themed_mailer.rb
 - lib/knitkit/extensions/active_record/acts_as_commentable.rb
 - lib/knitkit/extensions/active_record/acts_as_document.rb
 - lib/knitkit/extensions/active_record/acts_as_publishable.rb
 - lib/knitkit/extensions/active_record/theme_support/has_many_themes.rb
 - lib/knitkit/extensions/compass_ae/widgets/base.rb
+- lib/knitkit/extensions/compass_ae/widgets/widget_proxy_controller.rb
 - lib/knitkit/extensions/core/array.rb
-- lib/knitkit/extensions/railties/action_view.rb
+- lib/knitkit/extensions/railties/action_view/base.rb
+- lib/knitkit/extensions/railties/action_view/helpers/blog_helper.rb
+- lib/knitkit/extensions/railties/action_view/helpers/content_helper.rb
+- lib/knitkit/extensions/railties/action_view/helpers/knitkit_helper.rb
+- lib/knitkit/extensions/railties/action_view/helpers/menu_helper.rb
 - lib/knitkit/extensions/railties/theme_support/asset_tag_helper.rb
 - lib/knitkit/extensions/railties/theme_support/theme_file_resolver.rb
 - lib/knitkit/extensions.rb