RubyGems - kiteditor - Versions diffs - 1.0.12 → 1.0.13 - Mend

kiteditor 1.0.12 → 1.0.13

Files changed (289) hide show

data/{lib/generators/mercury/install/images/templates → app/controllers/mercury}/images_controller.rb RENAMED Viewed

File without changes

data/{lib/generators/mercury/install/images/templates/ar_paperclip_image.rb → app/models/mercury/image.rb} RENAMED Viewed

@@ -1,16 +1,9 @@
-# not used maybe???
-#
 class Mercury::Image < ActiveRecord::Base
   #self.table_name = :mercury_images
   #has_attached_file :image, :styles => { :medium => "300x300>", :large=>"600x600>", :thumb => "100x100>" }
-  attr_accessible :image
-  has_attached_file :image, :styles => { :medium => "300x300>", :thumb => "100x100>" },
-        :path => ":rails_root/public/system/:attachment/:id/:style/:filename",
-        :url => "/system/:attachment/:id/:style/:filename"
   #delegate :url, :to => :image

data/app/views/layouts/mercury.html.erb CHANGED Viewed

@@ -4,20 +4,30 @@
     <meta name="viewport" content="width=device-width, maximum-scale=1.0, initial-scale=1.0">
     <%= csrf_meta_tags %>
     <title>Mercury Editor</title>
-    <%= stylesheet_link_tag    'mercury' %>
-    <%= javascript_include_tag 'jquery-1.7', 'mercury' %>
+    <%= stylesheet_link_tag    'mercury', 'mercury_overrides' %>
+    <%= javascript_include_tag 'mercury', 'mercury_overrides' %>
   </head>
   <body>
     <script type="text/javascript">
-      // Set to the url that you want to save any given page to, leave null for default handling.
-      var saveUrl = null;
+      var saveUrl = null; // Set to the url that you want to save any given page to.
+      var options = {
+        saveStyle: null,  // 'form', or 'json' (default json)
+        saveMethod: null, // 'POST', or 'PUT', (create, vs. update -- default POST)
+        visible: null     // if the interface should start visible or not (default true)
+      };
-      // Instantiate the PageEditor
-      new Mercury.PageEditor(saveUrl, {
-        saveStyle:  null, // 'form', or 'json' (default json)
-        saveMethod: null, // 'PUT', or 'POST', (create, vs. update -- default PUT)
-        visible:    true  // boolean - if the interface should start visible or not
-      });
+      <!-- Mix in any configurations provided through Rails.application.config.mercury_config -->
+      <% if Rails.application.config.respond_to?(:mercury_config) %>
+        jQuery.extend(Mercury.config, <%= Rails.application.config.mercury_config.to_json.html_safe %>);
+      <% end -%>
+      <!-- Mix in any options for PageEditor provided through Rails.application.config.mercury_page_editor_config -->
+      <% if Rails.application.config.respond_to?(:mercury_page_editor_config) %>
+        jQuery.extend(options, <%= Rails.application.config.mercury_page_editor_config.to_json.html_safe %>);
+      <% end -%>
+      <!-- Instantiate the PageEditor -->
+      new Mercury.PageEditor(saveUrl, options);
     </script>
   </body>
 </html>

data/app/views/mercury/modals/character.html CHANGED Viewed

@@ -1,4 +1,4 @@
-<form id="mercury_character" class="mercury-form" style="width:456px">
+<form id="mercury_character" style="width:456px">
   <div class="mercury-display-pane-container">
     <div class="mercury-display-pane">

data/app/views/mercury/modals/htmleditor.html CHANGED Viewed

@@ -1,9 +1,13 @@
-<form id="mercury_html_editor" class="mercury-form" style="width:650px">
+<form id="mercury_html_editor" style="width:650px">
   <textarea class="mercury-display-pane-container" rows="5" style="width:100%"></textarea>
-  <div class="form-actions mercury-display-controls">
-    <input class="btn btn-primary" name="commit" type="submit" value="Save and Replace"/>
+  <div class="mercury-display-controls">
+    <fieldset class="buttons">
+      <ol>
+        <li class="commit button"><input class="submit" name="commit" type="submit" value="Save and Replace"/></li>
+      </ol>
+    </fieldset>
   </div>
 </form>

data/app/views/mercury/modals/link.html CHANGED Viewed

@@ -1,27 +1,26 @@
-<form id="mercury_link" class="form-horizontal" style="height: 875px; width: 800px;">
+<form id="mercury_link" style="height: 875px; width: 800px;">
-  <div class="form-inputs mercury-display-pane-container">
+  <div class="mercury-display-pane-container">
+    <div class="mercury-display-pane">
-    <fieldset id="link_text_container">
-      <div class="control-group string optional">
-        <label class="string optional control-label" for="link_text">Link Content</label>
-        <div class="controls">
-          <input class="span6 string optional" id="link_text" name="link[text]" size="50" type="text">
-        </div>
-      </div>
-    </fieldset>
+      <fieldset class="inputs" id="link_text_container">
+        <ol>
+          <li id="link_text_input" class="string input optional stringish">
+            <label class="label" for="link_text">Link Content</label>
+            <input id="link_text" name="link[text]" type="text"/>
+          </li>
+        </ol>
+      </fieldset>
-    <fieldset>
-      <legend>Standard Links</legend>
-      <div class="control-group url optional">
-        <label class="url optional control-label" for="link_external_url">
-          <input name="link_type" type="radio" value="external_url" checked="checked"/>URL
-        </label>
-        <div class="controls">
-          <input class="span6 string url optional" id="link_external_url" name="link[external_url]" size="50" type="text">
-        </div>
-      </div>
-    </fieldset>
+      <fieldset class="inputs">
+        <legend><span>Standard Links</span></legend>
+        <ol>
+          <li id="link_external_url_input" class="string input optional stringish">
+            <label class="label" for="link_external_url"><input name="link_type" type="radio" value="external_url" checked="checked"/>URL</label>
+            <input class="selectable" id="link_external_url" name="link[external_url]" type="text"/>
+          </li>
+        </ol>
+      </fieldset>
       <fieldset class="inputs">
         <legend><span>Internal Link</span></legend>
@@ -56,25 +55,40 @@
         </ol>
       </fieldset>
-    <fieldset>
-      <legend>Options</legend>
-      <div class="control-group select optional">
-        <label class="select optional control-label" for="link_target">Link Target</label>
-        <div class="controls">
-          <select class="select optional" id="link_target" name="link[target]">
-            <option value="">Self (the same window or tab)</option>
-            <option value="_blank">Blank (a new window or tab)</option>
-            <option value="_top">Top (removes any frames)</option>
-            <option value="popup">Popup Window (javascript new window popup)</option>
-          </select>
-        </div>
-      </div>
-    </fieldset>
+      <fieldset class="inputs">
+        <legend><span>Options</span></legend>
+        <ol>
+          <li id="link_target_input" class="select input optional">
+            <label class="label" for="link_target">Link Target</label>
+            <select id="link_target" name="link[target]">
+              <option value="">Self (the same window or tab)</option>
+              <option value="_blank">Blank (a new window or tab)</option>
+              <option value="_top">Top (removes any frames)</option>
+              <option value="popup">Popup Window (javascript new window popup)</option>
+            </select>
+          </li>
+          <div id="popup_options" class="link-target-options" style="display:none">
+            <li id="link_popup_width_input" class="string input optional stringish">
+              <label class="label" for="link_popup_width">Popup Width</label>
+              <input id="link_popup_width" name="link[popup_width]" type="text"/>
+            </li>
+            <li id="link_popup_height_input" class="string input optional stringish">
+              <label class="label" for="link_popup_height">Popup Height</label>
+              <input id="link_popup_height" name="link[popup_height]" type="text"/>
+            </li>
+          </div>
+        </ol>
+      </fieldset>
+    </div>
   </div>
-  <div class="form-actions mercury-display-controls">
-    <input class="btn btn-primary" name="commit" type="submit" value="Insert Link">
+  <div class="mercury-display-controls">
+    <fieldset class="buttons">
+      <ol>
+        <li class="commit button"><input class="submit" name="commit" type="submit" value="Insert Link"/></li>
+      </ol>
+    </fieldset>
   </div>
 </form>

data/app/views/mercury/modals/media.html CHANGED Viewed

@@ -1,103 +1 @@
 Not used (rendered by Kit)
-<form id="mercury_media" class="form-horizontal" style="width:615px">
-  <div class="form-inputs mercury-display-pane-container">
-    <fieldset>
-      <legend>Images</legend>
-      <div class="control-group url optional">
-        <label class="url optional control-label" for="media_image_url">
-          <input name="media_type" type="radio" value="image_url" checked="checked"/>URL
-        </label>
-        <div class="controls">
-          <input class="span6 string url optional" id="media_image_url" name="media[image_url]" size="50" type="text">
-        </div>
-      </div>
-    </fieldset>
-    <fieldset>
-      <legend>Videos</legend>
-      <div class="control-group url optional">
-        <label class="url optional control-label" for="media_youtube_url">
-          <input name="media_type" type="radio" value="youtube_url"/>YouTube URL
-        </label>
-        <div class="controls">
-          <input class="span6 string url optional" id="media_youtube_url" name="media[youtube_url]" size="50" type="text" placeholder="http://youtu.be/Pny4hoN8eII">
-        </div>
-      </div>
-      <div class="control-group url optional">
-        <label class="url optional control-label" for="media_vimeo_url">
-          <input name="media_type" type="radio" value="vimeo_url"/>Vimeo URL
-        </label>
-        <div class="controls">
-          <input class="span6 string url optional" id="media_vimeo_url" name="media[vimeo_url]" size="50" type="text" placeholder="http://vimeo.com/25708134">
-        </div>
-      </div>
-    </fieldset>
-    <fieldset>
-      <legend>Options</legend>
-      <div class="media-options" id="image_url_options">
-        <div class="control-group select optional">
-          <label class="select optional control-label" for="media_image_alignment">Alignment</label>
-          <div class="controls">
-            <select class="select optional" id="media_image_alignment" name="media[image_alignment]">
-              <option value="">None</option>
-              <option value="left">Left</option>
-              <option value="right">Right</option>
-              <option value="top">Top</option>
-              <option value="middle">Middle</option>
-              <option value="bottom">Bottom</option>
-              <option value="absmiddle">Absolute Middle</option>
-              <option value="absbottom">Absolute Bottom</option>
-            </select>
-          </div>
-          <label class="select optional control-label" for="media_image_float">Float</label>
-          <div class="controls">
-            <select class="select optional" id="media_image_float" name="media[image_float]">
-              <option value="">None</option>
-              <option value="left">Left</option>
-              <option value="right">Right</option>
-              <option value="none">None</option>
-              <option value="inherit">Inherit</option>
-            </select>
-          </div>
-        </div>
-      </div>
-      <div class="media-options" id="youtube_url_options" style="display:none">
-        <div class="control-group number optional">
-          <label class="number optional control-label" for="media_youtube_width">Width</label>
-          <div class="controls">
-            <input class="span2 number optional" id="media_youtube_width" name="media[youtube_width]" size="50" type="number" value="560">
-          </div>
-        </div>
-        <div class="control-group number optional">
-          <label class="number optional control-label" for="media_youtube_height">Height</label>
-          <div class="controls">
-            <input class="span2 number optional" id="media_youtube_height" name="media[youtube_height]" size="50" type="number" value="349">
-          </div>
-        </div>
-      </div>
-      <div class="media-options" id="vimeo_url_options" style="display:none">
-        <div class="control-group number optional">
-          <label class="number optional control-label" for="media_vimeo_width">Width</label>
-          <div class="controls">
-            <input class="span2 number optional" id="media_vimeo_width" name="media[vimeo_width]" size="50" type="number" value="400">
-          </div>
-        </div>
-        <div class="control-group number optional">
-          <label class="number optional control-label" for="media_vimeo_height">Height</label>
-          <div class="controls">
-            <input class="span2 number optional" id="media_vimeo_height" name="media[vimeo_height]" size="50" type="number" value="225">
-          </div>
-        </div>
-      </div>
-    </fieldset>
-  </div>
-  <div class="form-actions mercury-display-controls">
-    <input class="btn btn-primary" name="commit" type="submit" value="Insert Media"/>
-  </div>
-</form>

data/app/views/mercury/modals/table.html CHANGED Viewed

@@ -1,90 +1,84 @@
-<form id="mercury_table" class="form-horizontal" style="width:700px">
+<form id="mercury_table" style="width:700px">
-  <div class="form-inputs mercury-display-pane-container">
+  <div class="mercury-display-pane-container">
+    <div class="mercury-display-pane">
-    <fieldset id="table_display">
-      <div class="control-group optional">
-        <div class="controls">
-          <table border="1" cellspacing="0">
-            <tr>
-              <td>&nbsp;</td>
-              <td>&nbsp;</td>
-              <td>&nbsp;</td>
-            </tr>
-            <tr>
-              <td>&nbsp;</td>
-              <td>&nbsp;</td>
-              <td>&nbsp;</td>
-            </tr>
-          </table>
-        </div>
+      <div id="table_display">
+        <table border="1" cellspacing="0">
+          <tr>
+            <td>&nbsp;</td>
+            <td>&nbsp;</td>
+            <td>&nbsp;</td>
+          </tr>
+          <tr>
+            <td>&nbsp;</td>
+            <td>&nbsp;</td>
+            <td>&nbsp;</td>
+          </tr>
+        </table>
       </div>
-    </fieldset>
-    <fieldset>
-      <div class="control-group buttons optional">
-        <label class="buttons optional control-label">Rows</label>
-        <div class="controls btn-group">
-          <button class="btn" data-action="addRowBefore">Add Before</button>
-          <button class="btn" data-action="addRowAfter">Add After</button>
-          <button class="btn" data-action="removeRow">Remove</button>
-        </div>
-      </div>
-      <div class="control-group buttons optional">
-        <label class="buttons optional control-label">Columns</label>
-        <div class="controls btn-group">
-          <button class="btn" data-action="addColumnBefore">Add Before</button>
-          <button class="btn" data-action="addColumnAfter">Add After</button>
-          <button class="btn" data-action="removeColumn">Remove</button>
-        </div>
-      </div>
-      <hr/>
-      <div class="control-group buttons optional">
-        <label class="buttons optional control-label">Row Span</label>
-        <div class="controls btn-group">
-          <button class="btn" data-action="increaseRowspan">+</button>
-          <button class="btn" data-action="decreaseRowspan">-</button>
-        </div>
-      </div>
-      <div class="control-group buttons optional">
-        <label class="buttons optional control-label">Column Span</label>
-        <div class="controls btn-group">
-          <button class="btn" data-action="increaseColspan">+</button>
-          <button class="btn" data-action="decreaseColspan">-</button>
-        </div>
-      </div>
-    </fieldset>
+      <div id="table_options">
+        <fieldset class="inputs">
+          <ol>
+            <li id="table_rows_input" class="select input optional">
+              <label for="table_rows">Rows</label>
+              <input type="button" class="action" value="Add Before" name="insertRowBefore"/>
+              <input type="button" class="action" value="Add After" name="insertRowAfter"/>
+              <input type="button" class="action" value="Remove" name="deleteRow"/>
+            </li>
+            <li id="table_columns_input" class="select input optional">
+              <label for="table_columns">Columns</label>
+              <input type="button" class="action" value="Add Before" name="insertColumnBefore"/>
+              <input type="button" class="action" value="Add After" name="insertColumnAfter"/>
+              <input type="button" class="action" value="Remove" name="deleteColumn"/>
+            </li>
+            <hr/>
+            <li id="table_row_adjust_input" class="select input optional">
+              <label for="table_row_adjust">Row Span</label>
+              <input type="button" class="action" value="+" name="increaseRowspan"/>
+              <input type="button" class="action" value="-" name="decreaseRowspan"/>
+            </li>
+            <li id="table_column_adjust_input" class="select input optional">
+              <label for="table_column_adjust">Column Span</label>
+              <input type="button" class="action" value="+" name="increaseColspan"/>
+              <input type="button" class="action" value="-" name="decreaseColspan"/>
+            </li>
+          </ol>
+        </fieldset>
-    <fieldset>
-      <legend>Options</legend>
-      <div class="control-group select optional">
-        <label class="select optional control-label" for="table_alignment">Alignment</label>
-        <div class="controls">
-          <select class="select optional" id="table_alignment" name="table[alignment]">
-            <option value="">None</option>
-            <option value="right">Right</option>
-            <option value="left">Left</option>
-          </select>
-        </div>
-      </div>
-      <div class="control-group number optional">
-        <label class="number optional control-label" for="table_border">Border</label>
-        <div class="controls">
-          <input class="span1 number optional" id="table_border" name="table[border]" size="50" type="number" value="1">
-        </div>
-      </div>
-      <div class="control-group number optional">
-        <label class="number optional control-label" for="table_spacing">Spacing</label>
-        <div class="controls">
-          <input class="span1 number optional" id="table_spacing" name="table[spacing]" size="50" type="number" value="0">
-        </div>
+        <fieldset class="inputs">
+          <legend><span>Options</span></legend>
+          <ol>
+            <li id="table_alignment_input" class="select input optional">
+              <label class="label" for="table_alignment">Alignment</label>
+              <select id="table_alignment" name="table[alignment]">
+                <option value="">None</option>
+                <option value="left">Left</option>
+                <option value="right">Right</option>
+              </select>
+            </li>
+            <li id="table_border_input" class="string input optional stringish">
+              <label class="label" for="table_border">Border</label>
+              <input id="table_border" name="table[border]" type="text" value="1"/>
+            </li>
+            <li id="table_spacing_input" class="string input optional stringish">
+              <label class="label" for="table_spacing">Spacing</label>
+              <input id="table_spacing" name="table[spacing]" type="text" value="0"/>
+            </li>
+          </ol>
+        </fieldset>
       </div>
-    </fieldset>
+    </div>
   </div>
-  <div class="form-actions mercury-display-controls">
-    <input class="btn btn-primary" name="commit" type="submit" value="Insert Table"/>
+  <div class="mercury-display-controls">
+    <fieldset class="buttons">
+      <ol>
+        <li class="commit button"><input class="submit" name="commit" type="submit" value="Insert Table" /></li>
+      </ol>
+    </fieldset>
   </div>
-</form>
+</form>

data/app/views/mercury/panels/snippets.html CHANGED Viewed

@@ -1,6 +1,6 @@
 <div class="mercury-snippet-panel">
   <div class="filter">
-    <input class="filter focusable" type="text">
+    <input class="filter" type="text">
   </div>
   <ul>
     <li data-filter="example, snippet, favorite, beer">
@@ -8,10 +8,5 @@
       <h4>Snippet Name</h4>
       <div class="description">A one or two line long description of what this snippet does.</div>
     </li>
-    <li data-filter="no options, snippet">
-      <img alt="No Option Snippet" data-snippet="no_options" data-options="false" src="/assets/mercury/default-snippet.png"/>
-      <h4>No Options Snippet</h4>
-      <div class="description">This snippet doesn't have options.</div>
-    </li>
   </ul>
 </div>

data/app/views/mercury/snippets/example/options.html.erb CHANGED Viewed

@@ -1,30 +1,34 @@
-<%= form_for 'options', {url: '', html: {class: 'form-horizontal', style: 'width:615px'}} do |f| %>
+<%= form_for 'options', { :html => { :style => 'width:600px' } } do |f| %>
-  <div class="form-inputs mercury-display-pane-container">
-    <fieldset>
-      <div class="control-group string optional">
-        <label class="string optional control-label" for="options_first_name">First Name</label>
-        <div class="controls">
-          <input class="span6 string optional" id="options_first_name" name="options[first_name]" size="50" type="text" value="<%= @options[:first_name] %>">
-        </div>
-      </div>
-    </fieldset>
-    <fieldset>
-      <legend>Options</legend>
-      <div class="control-group string optional">
-        <label class="string optional control-label" for="options_favorite_beer">Favorite Beer</label>
-        <div class="controls">
-          <input class="span6 string optional" id="options_favorite_beer" name="options[favorite_beer]" size="50" type="text" value="<%= @options[:favorite_beer] %>">
-        </div>
-      </div>
-    </fieldset>
+  <div class="mercury-display-pane-container">
+    <div class="mercury-display-pane">
+      <fieldset class="inputs">
+        <ol>
+          <li class="string input optional stringish" id="options_first_name_input">
+            <label class="label" for="options_first_name">First Name</label>
+            <input id="options_first_name" name="options[first_name]" type="text" value="<%= @options[:first_name] %>"/>
+          </li>
+        </ol>
+      </fieldset>
+      <fieldset class="inputs">
+        <legend><span>Options</span></legend>
+        <ol>
+          <li class="string input optional stringish" id="options_favorite_beer_input">
+            <label class="label" for="options_favorite_beer">Favorite Beer</label>
+            <input id="options_favorite_beer" name="options[favorite_beer]" type="text" value="<%= @options[:favorite_beer] %>"/>
+          </li>
+        </ol>
+      </fieldset>
+    </div>
   </div>
-  <div class="form-actions mercury-display-controls">
-    <input class="btn btn-primary" name="commit" type="submit" value="Insert Snippet"/>
+  <div class="mercury-display-controls">
+    <fieldset class="buttons">
+      <ol>
+        <li class="commit button"><input class="submit" name="commit" type="submit" value="Insert Snippet"/></li>
+      </ol>
+    </fieldset>
   </div>
 <% end %>

data/{lib/generators/mercury/install/images/templates/ar_paperclip_image_migration.rb → db/migrate/20110526035601_create_mercury_images.rb} RENAMED Viewed

File without changes

data/features/loading/loading.feature CHANGED Viewed

@@ -15,11 +15,8 @@ Feature:
   Scenario: A user can expect to see the contents of the iframe
-    Then I should see "Full region" in the content frame
+    Then I should see "Editable region" in the content frame
-  # Latest selenium webdriver seems to consider the lightview hidden
-  @use_hidden_elements
   Scenario: A user can expect to see the status bar
-    Then I should see "Mercury Editor v0.9.0" within the statusbar
+    Then I should see "Mercury Editor v0.3.0" within the statusbar

data/features/loading/user_interface.feature CHANGED Viewed

@@ -7,14 +7,12 @@ Feature:
   Background:
     Given I am on an editable page
-  # Scenario: A user can expect all this!
+  Scenario: A user can expect all this!
- # Latest selenium webdriver seems to consider the lightview hidden
- @use_hidden_elements
- Scenario: A user can view and close the about dialog
+#  Scenario: A user can view and close the about dialog
     When I click on the about the editor link
-    Then I should see "Mercury Editor" within the lightview window
+    Then I should see "Mercury Editor" within the lightview title
     And I should see "Mercury Editor is an open source HTML5 WYSIWYG editor written in Coffeescript using jQuery. The project has been released under the MIT license." within the lightview window
     And I should see "Project Home" within the lightview window
     And I should see "Project Source" within the lightview window
@@ -24,7 +22,7 @@ Feature:
     And the lightview overlay should not be visible
-  Scenario: A user can open and close select dropdowns
+#  Scenario: A user can open and close select dropdowns
     When I click on the formatblock editor dropdown
     Then the formatblock select should be visible
     And I should see "Heading 1 <h1>" within the formatblock select
@@ -34,7 +32,7 @@ Feature:
     And the formatblock select should not be visible
- Scenario: A user can open and close palette dialogs
+#  Scenario: A user can open and close palette dialogs
     When I click on the background color editor button
     Then the background color palette should be visible
@@ -43,7 +41,7 @@ Feature:
     And the background color palette should not be visible
- Scenario: A user can open and close a panel
+#  Scenario: A user can open and close a panel
     When I click on the "View History" button
     Then the history panel should be visible
     And I should see "Page Version History" within the history panel
@@ -52,7 +50,7 @@ Feature:
     Then the history panel should not be visible
- Scenario: A user can open and close a modal window
+#  Scenario: A user can open and close a modal window
     When I click on the "Insert Link" button
     Then the modal window should be visible
     And the modal overlay should be visible

data/features/regions/{full → editable}/advanced_editing.feature RENAMED Viewed

File without changes