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

kiteditor 1.0.11 → 1.0.12

Files changed (289) hide show

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

@@ -4,30 +4,20 @@
     <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', 'mercury_overrides' %>
-    <%= javascript_include_tag 'mercury', 'mercury_overrides' %>
+    <%= stylesheet_link_tag    'mercury' %>
+    <%= javascript_include_tag 'jquery-1.7', 'mercury' %>
   </head>
   <body>
     <script type="text/javascript">
-      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)
-      };
+      // Set to the url that you want to save any given page to, leave null for default handling.
+      var saveUrl = null;
-      <!-- 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);
+      // 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
+      });
     </script>
   </body>
 </html>

data/app/views/layouts/mercury.html.haml ADDED Viewed

@@ -0,0 +1,19 @@
+!!!
+%html
+  %head
+    %meta{:name => "viewport", :content => "width=device-width, maximum-scale=1.0, initial-scale=1.0"}
+    = csrf_meta_tags
+    %title Mercury Editor
+    = stylesheet_link_tag    'mercury'
+    = javascript_include_tag 'jquery-1.7', 'mercury'
+  %body
+    :javascript
+      // Set to the url that you want to save any given page to, leave null for default handling.
+      var saveUrl = null;
+      // 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
+      });

data/app/views/layouts/mercury.html.slim ADDED Viewed

@@ -0,0 +1,19 @@
+doctype html
+html
+  head
+    meta name="viewport" content="width=device-width, maximum-scale=1.0, initial-scale=1.0"
+    = csrf_meta_tags
+    title Mercury Editor
+    = stylesheet_link_tag    'mercury'
+    = javascript_include_tag 'jquery', 'mercury'
+  body
+    javascript:
+      // Set to the url that you want to save any given page to, leave null for default handling.
+      var saveUrl = null;
+      // 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
+      });

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

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

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

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

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

@@ -1,26 +1,27 @@
-<form id="mercury_link" style="height: 875px; width: 800px;">
+<form id="mercury_link" class="form-horizontal" style="height: 875px; width: 800px;">
-  <div class="mercury-display-pane-container">
-    <div class="mercury-display-pane">
+  <div class="form-inputs mercury-display-pane-container">
-      <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 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">
-        <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>
+      <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>Internal Link</span></legend>
@@ -55,40 +56,25 @@
         </ol>
       </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>
+    <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>
-    </div>
   </div>
-  <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 class="form-actions mercury-display-controls">
+    <input class="btn btn-primary" name="commit" type="submit" value="Insert Link">
   </div>
 </form>

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

@@ -1 +1,103 @@
 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,84 +1,90 @@
-<form id="mercury_table" style="width:700px">
+<form id="mercury_table" class="form-horizontal" style="width:700px">
-  <div class="mercury-display-pane-container">
-    <div class="mercury-display-pane">
+  <div class="form-inputs mercury-display-pane-container">
-      <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>
+    <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>
+    </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>
+      <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>
-        <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>
+    <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>
       </div>
+    </fieldset>
-    </div>
   </div>
-  <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 class="form-actions mercury-display-controls">
+    <input class="btn btn-primary" name="commit" type="submit" value="Insert Table"/>
   </div>
-</form>
+</form>