browsercms 3.5.7 → 4.0.0.alpha

data/app/views/cms/page_routes/edit.html.erb

@@ -1,3 +1,2 @@
-<% @toolbar_title = page_title "Edit Page Route" %>
-<%= content_for :functions, link_to(span_tag("List All"), page_routes_path, :class => "button") %>
-<%= render :partial => 'form' %>
+<%  use_page_title "Edit Page Route" %>
+<%= render 'form' %>

data/app/views/cms/page_routes/index.html.erb

@@ -1,56 +1,33 @@
-<% @toolbar_title = page_title "List Page Routes" %>
-<%= content_for(:html_head) do %>
-  <%= javascript_tag do %>
-    jQuery(function($){
-      $('table.data tbody tr').hover(function(){
-        $(this).addClass('hover')
-      }, function(){
-        $(this).removeClass('hover')
-      }).click(function(){
-        var match = this.id.match(/(.*)_(\d+)/) 
-        var type = match[1];
-        var id = match[2];
-        $('table.data tbody tr').removeClass('selected');
-        $(this).addClass('selected');
-        $('#edit_button').removeClass('disabled').attr('href', '/cms/page_routes/'+id+'/edit');
-        $('#delete_button, #view_button').removeClass('disabled').attr('href', '/cms/page_routes/'+id)
-      })
-    })
-  <% end %>
-<% end %>
-
-<%= content_for :functions do %>
-  <%= add_button new_page_route_path %>
-  <%= edit_button %>
-  <%= delete_button :title => "Are you sure you want to delete this Page Route?" %>
-  <%= link_to(span_tag("View"), "#", :id => 'view_button', :class => "button") %>
-  <%= link_to(span_tag("View Rails Routes"), routes_path, :class => "button") %>
+<% use_page_title "Page Routes" %>
+<%= render layout: 'page_title' do %>
+    <%= button_menu :top do %>
+        <div class="btn-group right">
+          <%= link_to("View Rails Routes", routes_path, :class => "btn btn-primary btn-small") %>
+        </div>
+        <%= link_to "Add", new_page_route_path, class: 'btn btn-primary btn-small right' %>
+    <% end %>
 <% end %>
-
-<div class="roundedcorners">
-  <table class="data">
-    <tr>
-      <th class="first" colspan="2"><div class="dividers">Name</div></th>
-      <th colspan="2" class="last"><div class="dividers">Pattern</div></th>
-    </tr>
+<%= render layout: 'main_content' do %>
+  <table class="data table table-bordered table-rounded table-hover table-striped">
+	<thead>  
+	    <tr>
+	      <th>Name</th>
+          <th>Pattern</th>
+          <th>Actions</th>
+	    </tr>
+	</thead>
     <% @page_routes.each do |page_route| %>
-      <tr id="page_route_<%= page_route.id %>">
-        <td class="first"></td>
-        <td><%=h page_route.name %></td>
-        <td><%=h page_route.pattern %></td>
-        <td class="last"></td>
+      <tr>
+        <td><%= page_route.name %></td>
+        <td><%= page_route.pattern %></td>
+        <td>
+          <%= link_to "Edit", edit_polymorphic_path(page_route), class: "btn btn-mini" %>
+          <%= link_to "Delete", polymorphic_path(page_route), class: "btn btn-mini btn-danger", method: 'delete',  data:{confirm: 'Are you sure you want to delete this route?'} %>
+        </td>
       </tr>
     <% end %>
-    <tr>
-      <td colspan="4" class="buffer"></td>
-    </tr>
-
   </table>
-<div class="tl"></div>
-<div class="tr"></div>
-<div class="bl"></div>
-<div class="br"></div>
-</div>
+<% end %>
 <% if @page_routes.total_pages > 1 %>
   <%= render_pagination @page_routes, Cms::PageRoute %>
 <% end %>

data/app/views/cms/page_routes/new.html.erb

@@ -1,3 +1,2 @@
-<% @toolbar_title = page_title "New Page Route" %>
-<%= content_for :functions, link_to(span_tag("List All"), page_routes_path, :class => "button") %>
-<%= render :partial => 'form' %>
+<% use_page_title "Add a New Page Route" %>
+<%= render 'form' %>

data/app/views/cms/pages/_edit_content.html.erb

@@ -0,0 +1,28 @@
+<%= content_tag 'div', class: 'connector',
+                data: {move_up: cms.move_up_connector_path(connector, format: :json),
+                       move_down: cms.move_down_connector_path(connector, format: :json),
+                       remove: cms.connector_path(connector, format: :json),
+                       edit_path: edit_engine_aware_path(connectable, :_redirect_to => @page.path)
+                } do %>
+    <% if (!content_supports_inline_editing?(connector)) %>
+        <%= link_to(image_tag('cms/arrow-up.png', class: 'cms-move-up-content-link'),
+                    move_up_connector_path(connector),
+                    method: :put,
+                    title: "Move this content up.") %>
+        <%= link_to(image_tag('cms/arrow-down.png', class: 'cms-move-down-content-link'),
+                    move_down_connector_path(connector),
+                    method: :put,
+                    title: "Move this content down.") %>
+        <%= link_to image_tag("ckeditor/plugins/delete_content/icons/deletecontent.png",
+                        class: 'cms-remove-content-link', alt: "Remove content"),
+                        cms.connector_path(connector, _redirect_to: @page.path),
+                        method: :delete,
+                        title: "Remove this content from page (#{connectable.name}).",
+                        data: { confirm:"Are you sure you want to remove this content from the page? (It will remain available in the Content Library.)"}
+        %>
+    <% end %>
+    <%= link_to(image_tag('cms/pencil.png', class: 'cms-edit-content-link'),
+                edit_engine_aware_path(connectable, :_redirect_to => @page.path),
+                title: "Edit this content.") %>
+    <%= render_connectable connectable %>
+<% end %>

data/app/views/cms/pages/_form.html.erb

@@ -1,38 +1,21 @@
-<%= content_for :html_head do %>
-  <%= stylesheet_link_tag('cms/form_layout') %>
-  <%= javascript_tag do %>
-  jQuery(function($) {
-    $('#page_template').selectbox({width: '440px'});
-  });
-  <% end %>
+<%= simple_form_for(@page) do |f| %>
+    <%= page_title_with_buttons f %>
+    <%= render layout: 'main_with_sidebar' do %>
+        <%= hidden_field_tag :section_id, @page.section_id %>
+        <%= render :partial => 'main_form', :locals => {:f => f} %>
+        <% content_for :sidebar do %>
+            <div class="sidebar-block">
+              <h4 class="gray">Status &nbsp; <%= draft_icon_tag(@block, force: true) %></h4>
+              <% if current_user.able_to?(:publish_content) %>
+                  <h4 class="gray label">Visibility</h4>
+                  <%= f.input :visibility, label: false, collection: @page.visibilities, prompt: false, input_html: {class: 'input-block-level'} %>
+              <% end %>
+            </div>
+            <div class="sidebar-block">
+              <h4 class="gray">Performance Tuning</h4>
+              <%= f.input :cacheable, label: "Allow Caching?", hint: "Uncheck to allow for personalized content." %>
+            </div>
+        <% end %>
+    <% end %>
+    <%= bottom_buttons f %>
 <% end %>
-<%= f.cms_error_messages %>
-<%= f.cms_text_field :name %>
-<%= f.cms_text_field :title, :instructions => "(Leave blank if same as name)" %>
-<%= f.cms_text_field :path %>
-<%= f.cms_drop_down :template_file_name, Cms::PageTemplate.options, {:label => "Template"}, :tabindex => next_tabindex %>
-
-<div class="checkbox_group fields no_check_all">
-  <div class="checkbox_fields">
-    <%= f.label :cacheable, "Cache Enabled?" %>
-    <%= f.check_box :cacheable, :tabindex => next_tabindex %>
-  </div>
-</div>
-
-<div class="checkbox_group fields no_check_all">
-  <div class="checkbox_fields">
-    <%= f.label :hidden, "Hide From Menus?" %>
-    <%= f.check_box :hidden, :disabled => (!current_user.able_to?(:publish_content)), :tabindex => next_tabindex %>
-  </div>
-</div>
-
-<div class="checkbox_group fields no_check_all">
-  <div class="checkbox_fields">
-    <%= f.label :archived, "Archived?" %>
-    <%= f.check_box :archived, :disabled => (!current_user.able_to?(:publish_content)), :tabindex => next_tabindex %>
-  </div>
-</div>
-
-<%= f.cms_text_area :description, :size=>"80x5", :instructions=>"(Optional) Often used for the meta-description element of the page." %>
-<%= f.cms_text_area :keywords, :size=>"80x3", :instructions=>"(Optional) Often used for the meta-keyword meta element of the page. Most search engine will ignore this however." %>
-<%= f.cms_text_field :language %>

data/app/views/cms/pages/_main_form.html.erb

@@ -0,0 +1,23 @@
+<% if @other_version %>
+  <%= render :partial => 'cms/shared/version_conflict_error', :locals => {:other_version => @other_version, :your_version => @page} %>
+  <%= f.hidden_field :lock_version, :value => @other_version.lock_version %>
+<% else %>
+  <%= f.hidden_field :lock_version %>
+<% end %>
+
+<%= f.input :name, label: false, placeholder: 'Page Name', input_html: {class: 'input-block-level input-xxlarge'} %>
+<%= f.input :path, placeholder: 'Page Path' %>
+<%= f.input :template_file_name, collection: Cms::PageTemplate.options, label: "Template", as: :select, include_blank: false %>
+
+<hr>
+<h3>Search Engine Optimization</h3>
+<%= f.input :title, label: "Browser Title", placeholder: 'Displays page name if left blank.',
+            :hint => "Used for <title> and <h1> elements on pages." %>
+
+<%= f.input :description, label: 'Meta Description', :hint => "(Optional) Used for the meta-description element of the page." %>
+<%= f.input :keywords, :hint => "(Optional) Used for the meta-keyword meta element of the page." %>
+<%= f.input :language %>
+
+<% if @other_version %>
+    <%= render :partial => "cms/shared/version_conflict_diff", :locals => {:other_version => @other_version, :your_version => @page} %>
+<% end %>

data/app/views/cms/pages/_simple_container.html.erb

@@ -0,0 +1,8 @@
+<div class="cms-container" data-container="<%= container %>">
+  <%= content %>
+  <%= image_tag "cms/plus.png",
+                :class => 'cms-add-content',
+                :data => {:remote => cms.new_page_component_path(:connect_to_page_id => @page, :connect_to_container => name)}
+  %>
+</div>
+

data/app/views/cms/pages/edit.html.erb

@@ -1,23 +1,2 @@
-<% page_title "Edit Properties / '#{h(@page.name)}' Page" %>
-<%= content_for :functions  do%>
-<h1><%= @page_title %></h1>
-<%= link_to(span_tag("list all"), cms.sitemap_path, :class => "button") %>
-<%= link_to(span_tag("edit content"), @page.path, :class => "button") %>
-<br clear="all" />
-<% end %>
-<%= form_for(@page) do |f| %>
-  <% if @other_version %>
-    <%= render :partial => 'cms/shared/version_conflict_error', :locals => {:other_version => @other_version, :your_version => @page} %>
-    <%= f.hidden_field :lock_version, :value => @other_version.lock_version %>
-  <% else %>
-    <%= f.hidden_field :lock_version %>
-  <% end %>
-  
-  <%= render :partial => 'form', :locals => {:f => f} %>
-  <% if @other_version %>
-    <%= render :partial => "cms/shared/version_conflict_diff", :locals => {:other_version => @other_version, :your_version => @page} %>
-  <% end %>  
-  <div class="buttons">
-    <%= lt_button_wrapper(f.submit("Save", :class => "submit", :tabindex => next_tabindex)) %>
-  </div>
-<% end %>
+<% use_page_title "Configure Page" %>
+<%= render 'form' %>

data/app/views/cms/pages/new.html.erb

@@ -15,19 +15,5 @@ jQuery(function($){
 });
 </script>
 <% end %>
-
-<% page_title "New Page" %>
-<%= content_for :functions do %>
-<%= "<h1>#{ @page_title }</h1>" %> 
-<%= link_to(span_tag("list all"), cms.sitemap_path, :class => "button") %>
-<br clear="all"/>
-<% end %>
-<%= form_for(@page) do |f| %>
-  <%= hidden_field_tag :section_id, @page.section_id %>
-  
-  <%= render :partial => 'form', :locals => {:f => f} %>
-  <div class="buttons">
-  <%= lt_button_wrapper(f.submit("Save", :class => "submit", :tabindex => next_tabindex)) %>
-  </div>
-<% end %>
-
+<% use_page_title "Add A New Page" %>
+<%= render 'form' %>

data/app/views/cms/pages/versions.html.erb

@@ -1,91 +1,22 @@
-<% @page_title = @toolbar_title = "List Versions / '#{@page.name}' Page" %>
-<%= content_for(:html_head) do %>
-  <%= javascript_tag do %>
-    jQuery(function($){
-      $('table.data tbody tr').hover(function(){
-        $(this).addClass('hover')
-      }, function(){
-        $(this).removeClass('hover')
-      }).click(function(){
-        var match = this.id.match(/(.*)_(\d+)/) 
-        var type = match[1];
-        var id = match[2];
-        $('table.data tbody tr').removeClass('selected');
-        $(this).addClass('selected');
-        $('#view_button').removeClass('disabled').attr('href', '/cms/pages/<%= @page.id %>/version/'+id+'?mode=view');
-        if ($(this).hasClass('current')){
-          $('#revert_button').addClass('disabled').attr('href', '');
-          $('#revert_form').attr('action', '');
-          $('#revert_form_version').attr('value', '');
-          $('#edit_content_button').removeClass('disabled').attr('href', '/cms/pages/<%= @page.id %>?mode=edit');
-          $('#edit_properties_button').removeClass('disabled').attr('href', '/cms/pages/<%= @page.id %>/edit');
-        } else {
-          $('#revert_button').removeClass('disabled');
-          $('#revert_form').attr('action', '/cms/pages/<%= @page.id %>/revert_to/'+id);
-          $('#revert_form_version').attr('value', id);
-          $('#edit_content_button').addClass('disabled').attr('href', '');
-          $('#edit_properties_button').addClass('disabled').attr('href', '');
-        }
-      })
-    })
-  <% end %>
-  <%= stylesheet_link_tag("cms/content_library") %>
-  <%= stylesheet_link_tag("cms/form_layout") %>
+<% use_page_title "Versions: '#{@page.name}' Page" %>
+<%= render layout: 'page_title' do %>
+    <%= link_to "Back to Page", :back, class: 'btn btn-small right' %>
 <% end %>
-<%= content_for :functions do %>
-  <%=  "<h1>#{ @toolbar_title }</h1>" %>
-  <%= link_to span_tag("view"), "#", :id => "view_button", :class => "button disabled" %>
-  <%= link_to span_tag("edit content"), "#", :id => "edit_content_button", :class => "button disabled" %>
-  <%= link_to span_tag("edit properties"), "#", :id => "edit_properties_button", :class => "button disabled" %>
-  <%= link_to span_tag("revert"), "#", :id => "revert_button", :class => "button disabled", :onclick => "$('#revert_form').submit(); return false;" %>
-  <%= form_tag '', :method => 'put', :id => "revert_form" do %>
-  <%= hidden_field_tag :version, '', :id => 'revert_form_version'  %>
-  <% end %>
-  <br clear="all" />
-<% end %>
-
-<div class="roundedcorners">
-  <table id="blocks" class="data">
-    <thead>
+<%= render layout: 'main_content' do %>
+    <table class="data table table-rounded table-bordered table-hover table-striped">
+      <thead>
       <tr>
-        <th class="first" colspan="2"><div class="dividers">Version</div></th>
-        <th><div class="dividers">Comment</div></th>
-        <th><div class="dividers">Date</div></th>
-        <th class="last" colspan="2"><div class="dividers">Editor</div></th>
+        <th>Version</th>
+        <th>Comment</th>
+        <th>Date</th>
+        <th>Editor</th>
+        <th>Action</th>
       </tr>
-    </thead>
-    <tbody>
-      <% @page.versions.all(:order => "version desc").each_with_index do |r, i| %>
-        <% current = @page.version == r.version %>
-        <tr id="revision_<%= r.version %>" <%= 'class="current"' if current %>>
-          <td class="first"></td>
-          <td>
-            <div class="dividers">
-              <%= "v.#{r.version}" %>
-              <%= '(LIVE)' if @page.version == r.version %>
-              <%= '(CURRENT)' if i == 0 %>
-            </div>
-          </td>
-          <td>
-            <div class="dividers"><%=h r.version_comment %></div>
-          </td>
-          <td>
-            <div class="dividers"><%= r.created_at.strftime("%b %d, %Y %I:%M %p") if r.created_at %></div>
-          </td>
-          <td>
-            <div><%= r.updated_by.login if r.updated_by %></div>
-          </td>
-          <td class="last"></td>
-        </tr>
+      </thead>
+      <tbody>
+      <% @page.versions.order("version desc").each_with_index do |r, i| %>
+          <%= render partial: 'version', locals: {revision: r, original: @page,  i: i} %>
       <% end %>
-      <tr>
-	<td colspan="8" class="buffer"></td>
-      </tr>
-    </tbody>
-  </table>
-  <div class="tl"></div>
-  <div class="tr"></div>
-  <div class="bl"></div>
-  <div class="br"></div>
-</div>
-
+      </tbody>
+    </table>
+<% end %>

data/app/views/cms/redirects/_form.html.erb

@@ -1,15 +1,7 @@
-<%= content_for :html_head, stylesheet_link_tag('cms/form_layout') %>
-<%= form_for(@redirect) do |f| %>
-  <%= f.cms_error_messages %>
-  <div class="fields text_fields">
-    <%= f.label :from_path, "From" %>
-    <%= f.text_field :from_path, :size => 50 %>
-  </div>
-  <div class="fields text_fields">
-    <%= f.label :to_path, "To" %>
-    <%= f.text_field :to_path, :size => 50 %>
-  </div>
-  <div class="buttons">
-    <%= lt_button_wrapper(f.submit("Save", :class => "submit")) %>
-  </div>
+<% content_for :buttons, 'save_buttons' %>
+<%= simple_form_for(@redirect) do |f| %>
+    <%= render layout: 'form_with_buttons', locals: {f: f} do %>
+        <%= f.input :from_path, label: "From" %>
+        <%= f.input :to_path, label: "To" %>
+    <% end %>
 <% end %>

data/app/views/cms/redirects/edit.html.erb

@@ -1,3 +1,2 @@
-<% @page_title = @toolbar_title = "Edit Redirect" %>
-<%= content_for :functions, link_to(span_tag("List All"), redirects_path, :class => "button") %>
-<%= render :partial => 'form' %>
+<% use_page_title "Edit Redirect" %>
+<%= render 'form' %>

data/app/views/cms/redirects/index.html.erb

@@ -1,51 +1,25 @@
-<% @page_title = @toolbar_title = "List Redirects" %>
-<%= content_for(:html_head) do %>
-  <%= javascript_tag do %>
-    jQuery(function($){
-      $('table.data tbody tr').hover(function(){
-        $(this).addClass('hover')
-      }, function(){
-        $(this).removeClass('hover')
-      }).click(function(){
-        var match = this.id.match(/(.*)_(\d+)/) 
-        var type = match[1];
-        var id = match[2];
-        $('table.data tbody tr').removeClass('selected');
-        $(this).addClass('selected');
-        $('#edit_button').removeClass('disabled').attr('href', '/cms/redirects/'+id+'/edit');
-        $('#delete_button').removeClass('disabled').attr('href', '/cms/redirects/'+id)
-      })
-    })
-  <% end %>
+<% use_page_title "Redirects" %>
+<%= render layout: 'page_title' do %>
+    <%= link_to "Add", new_redirect_path, class: 'btn btn-primary btn-small right' %>
 <% end %>
-<%= content_for :functions do %>
-    <%= add_button new_redirect_path %>
-    <%= edit_button %>
-    <%= delete_button :title => "Are you sure you want to delete this Redirect?" %>
-<% end -%>
-
-<div class="roundedcorners">
-<table class="data">
-  <thead>
-  <tr>
-    <th class="first" colspan="2" style="width: 48%;"><div class="dividers">From</div></th>
-    <th class="last" colspan="2"><div class="dividers">To</div></th>
-  </tr>
-  </thead>
-  <% @redirects.each do |redirect| %>
-    <tr id="redirect_<%= redirect.id %>">
-      <td class="first"></td>
-      <td><div class="dividers"><%=h redirect.from_path %></div></td>
-      <td><%=h redirect.to_path %></td>
-      <td class="last"></td>
-    </tr>
-  <% end %>
-    <tr>
-      <td colspan="4" class="buffer"></td>
-    </tr>
-</table>
-<div class="tl"></div>
-<div class="tr"></div>
-<div class="bl"></div>
-<div class="br"></div>
-</div>
+<%= render layout: 'main_content' do %>
+    <table class="data cms-content-table table table-striped table-bordered table-hover">
+      <thead>
+      <tr>
+        <th>From</th>
+        <th>To</th>
+        <th>Actions</th>
+      </tr>
+      </thead>
+      <% @redirects.each do |redirect| %>
+          <tr>
+            <td><%= redirect.from_path %></td>
+            <td><%= redirect.to_path %></td>
+            <td>
+              <%= link_to "Edit", edit_polymorphic_path(redirect), class: "btn btn-mini" %>
+              <%= link_to "Delete", polymorphic_path(redirect), class: "btn btn-mini btn-danger", method: 'delete', data: {confirm: 'Are you sure you want to delete this redirect?'} %>
+            </td>
+          </tr>
+      <% end %>
+    </table>
+<% end %>