browsercms 3.5.7 → 4.0.0.alpha

data/app/views/cms/content/editing_frame.html.erb

@@ -0,0 +1 @@
+<%= page_content_iframe(edit_content_path(current_page)) %>

data/app/views/cms/content/no_page.html.erb

@@ -1,37 +1,19 @@
-<% page_title "Page Not Found" %>
+<% use_page_title "Page Not Found" %>
 
-<%# 
+<%#
   Note that we have to clear out the existing contents of
   the functions and html_head content because you can have
   an error occur in the view after stuff has been already
   set in those variables
 %>
-
-<% @content_for_functions = "" %>
-<%= content_for :functions, "<h1>#{ page_title }</h1>".html_safe %>
-
 <% @content_for_html_head = "" %>
-<%= content_for :html_head do %>
-  <style type="text/css">
-    .cms_error {
-      overflow: auto;
-      padding: 10px;
-    }
-    .cms_error h2 {
-      font-size: 18px;
-      font-weight: bold;
-      line-height: 18px;
-      margin-bottom: 5px;
-    }
-    .cms_error pre {
-      font-family: "Monaco", monospace;
-      font-size: 12px;
-      line-height: 12px;
-      margin-bottom: 20px;
-    }
-  </style>
+
+<%= render layout: 'page_title' do %>
+    <div class="right btn-group">
+      <%= cancel_button :top, 'Back' %>
+    </div>
 <% end %>
 
-<div class="cms_error">
-  <h2>There is no page at <%= @path %></h2>
+<div class="row-fluid padded">
+  <p>There is no page at <%= @path %></p>
 </div>

data/app/views/cms/content/show.html.erb

@@ -1,22 +1,21 @@
 <%= content_for :html_head do %>
-  <meta name="generator" content="BrowserCMS <%= Cms.version %>"/>
-  <% if is_editing_page?(current_page) %>
-  <%= javascript_include_tag 'cms/core_library' %>
-  <% if  @authenticity_token_loaded.nil? && protect_against_forgery? %><script type="text/javascript">
-    jQuery(function($){
-      $.cms.authenticity_token = '<%= form_authenticity_token %>'
-    })
-  </script><% end %><% @authenticity_token_loaded = true %>
-  <% end %>
+    <meta name="generator" content="BrowserCMS <%= Cms.version %>"/>
+    <%# JQuery is required both for page_editor and cms/user. But it needs to be included only once.  %>
+    <%= javascript_include_tag 'jquery' %>
+    <% if @show_toolbar %>
+        <%= javascript_include_tag 'cms/page_editor' %>
+        <%= stylesheet_link_tag 'cms/page_content_editing' %>
+        <%= csrf_meta_tags %>
+    <% end %>
+    <%= javascript_include_tag 'cms/site' %>
 <% end %>
 <% if @show_toolbar %>
-  <% flash.keep %>
+    <% flash.keep %>
 <% end %>
 
 <% @_connectors.each_with_index do |connector, i| %>
-  <%= content_for(connector.container.to_sym) do %>
-    <%= render_connector_and_connectable(connector, @_connectables[i]) %>
-  <% end %>
-<% end %> 
-
+    <%= content_for(connector.container.to_sym) do %>
+        <%= render_connector_and_connectable(connector, @_connectables[i]) %>
+    <% end %>
+<% end %>
 

data/app/views/cms/content_block/_block_form.html.erb

@@ -0,0 +1,15 @@
+<%= content_block_form_for(@block) do |f| %>
+    <%= page_title_with_buttons f %>
+    <%= render 'form_errors', form: f %>
+    <%= render 'exception', :object => @exception if @exception %>
+    <%= render :partial => 'version_conflict_error', :locals => {:other_version => @other_version, :your_version => @block} if @other_version %>
+    <%= render 'hidden_fields', f: f %>
+    <div class="padded row-fluid">
+      <div class="span8 main-content">
+        <%= render block_form, f: f %>
+      </div>
+      <%= render partial: 'sidebar', layout: 'sidebar_layout' unless @block.new_record? %>
+    </div>
+    <%= render :partial => "version_conflict_diff", :locals => {:other_version => @other_version, :your_version => @block} if @other_version %>
+    <%= bottom_buttons f %>
+<% end %>

data/app/views/cms/content_block/_buttonbar.html.erb

@@ -0,0 +1,29 @@
+<%# Obsolete - Remove after CRUD is done. %>
+<% # Handles both looking at a single block and a collection of blocks.
+   unless @block
+    @block = content_type.model_class.new
+   end
+%>
+<%#
+ Enable/Disable publish button for
+    - editting permission
+    - If block is already published.
+%>
+<span class="btn-group pull-left">
+  <%= menu_button("Back to #{@block.class.content_type.display_name_plural}", engine_aware_path(@block.class)) unless @block.new_record? %>
+  <%= publish_menu_button(@block) %>
+  <% if @block.class.addressable? %>
+  <%= link_to("Preview", @block.path, id: "preview_button", target: "_blank", class: "btn btn-primary") %>
+  <% end %>
+  <%= view_content_menu_button(@block) %>
+  <%= edit_content_menu_button(@block) %>
+</span>
+<%= versions_menu_button(@block) %>
+<%= delete_menu_button(@block) %>
+<% if @block.persisted? %>
+    <% if @block.publishable? && !@block.live? %>
+        <span id="page-status-label" class="draft-status">DRAFT</span>
+    <% else %>
+       <span id="page-status-label" class="published-status">Published</span>
+    <% end %>
+<% end %>

data/app/views/cms/content_block/_buttons.html.erb

@@ -0,0 +1,13 @@
+<%# Buttons for blocks need to be aware of whether the underlying block is publishable or not. %>
+<%= button_menu location do %>
+    <% if @block.class.publishable? %>
+    <%= f.button :publish, location: location %>
+    <% else %>
+    <%= f.button :save, location: location %>
+    <% end %>
+
+    <div class="btn-group right">
+      <%= cancel_button location %>
+      <%= f.button :save_draft, location: location if @block.class.publishable? %>
+    </div>
+<% end %>

data/app/views/cms/content_block/_hidden_fields.html.erb

@@ -0,0 +1,13 @@
+<% if params[:_redirect_to] %>
+    <%= hidden_field_tag :_redirect_to, params[:_redirect_to] %>
+<% end -%>
+<% if @block.respond_to?(:lock_version) %>
+    <%= f.hidden_field :lock_version, :value => (@other_version ? @other_version.lock_version : @block.lock_version) %>
+<% end -%>
+<% if @block.class.connectable? %>
+    <%= f.hidden_field :connect_to_page_id %>
+    <%= f.hidden_field :connect_to_container %>
+<% end -%>
+<% if @parent %>
+    <%= hidden_field_tag :parent, @parent.id %>
+<% end %>

data/app/views/cms/content_block/_sidebar.html.erb

@@ -0,0 +1,35 @@
+<% if @block.class.publishable? %>
+    <div class="sidebar-block">
+      <h4 class="gray">Status &nbsp; <%= draft_icon_tag(@block, force: true) %></h4>
+    </div>
+<% end %>
+<% if @block.class.connectable? %>
+    <div class="sidebar-block">
+      <% if @block.connected_pages.empty? %>
+          <h4 class="gray">Used on: <span class="dark right">Not attached to any page.</span></h4>
+      <% else %>
+
+          <ul class="unstyled">
+            <h4 class="gray">Changes will affect:</h4>
+            <% @block.connected_pages.each do |page| %>
+                <li><%= link_to page.name, page_path(page), target: "_blank" %></li>
+            <% end %>
+          </ul>
+      <% end %>
+<% if @block.respond_to?(:draft_version?) && !@block.draft_version? %>
+    <h4>Version: v. <%= @block.version %> ( <%= link_to "Current", engine_aware_path(@block) %> )</h4>
+<% end %>
+</div>
+<% end %>
+<div class='sidebar-block'>
+  <h4 class="gray">Actions</h4>
+  <%=  yield :sidebar_actions if content_for(:sidebar_actions)%>
+  <div class="btn-group">
+    <%= link_to "View", engine_aware_path(@block), class: "btn btn-small" %>
+    <%= link_to("Preview", @block.path, id: "preview_button", target: "_blank", class: "btn btn-small") if @block.class.addressable? %>
+    <%= link_to "Versions", engine(@block).polymorphic_path([:versions, @block]), class: "btn btn-small" if @block.class.versioned? %>
+  </div>
+  <div class="btn-group">
+    <%= link_to "Delete", engine_aware_path(@block), class: "btn btn-small btn-danger confirm_with_title http_delete", title: "Are you sure you want to delete this content?" %>
+  </div>
+</div>

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

@@ -0,0 +1,3 @@
+<% use_page_title "Edit #{content_type.display_name}" %>
+<%= render 'block_form' %>
+

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

@@ -0,0 +1,87 @@
+<% use_page_title "Assets - #{content_type.display_name_plural}" %>
+<div class="padded row-fluid clearfix">
+  <h1 class="span3">Assets</h1>
+
+  <%= form_for @search_filter, url: engine_aware_path(@search_filter.model_class), html: {class: 'form-search'}, method: :get do |f| %>
+      <%= f.text_field :term, class: "span6 search-query right", placeholder: "Search #{content_type.display_name_plural}" %>
+  <% end %>
+</div>
+<%= form_tag engine_aware_path(@search_filter.path), method: :put do %>
+    <div class="padded row-fluid clearfix">
+      <div class="btn-group span3 top-buttons">
+        <button class="btn btn-small dropdown-toggle btn-solo" data-toggle="dropdown" data-purpose="subheader">
+          <%= content_type.display_name_plural %> &nbsp;<span class="caret"></span>
+        </button>
+        <%= render partial: 'layouts/cms/content_types', locals: {library: false, id: 'asset-selector-menu'} %>
+      </div>
+
+    <span class="span9 top-buttons">
+        <%= submit_tag "Publish", class: "right btn btn-small btn-primary primary-cta" if content_type.model_class.publishable? %>
+
+        <div class="btn-group right">
+          <%= submit_tag "Delete", class: 'btn btn-small', data: {confirm: 'Are you sure you want to delete all these records?'} %>
+        </div>
+
+        <%= yield :bulk_actions if content_for?(:bulk_actions) %>
+        <h4 class="right"><%= @total_number_of_items %> ITEMS</h4>
+    </span>
+    </div>
+
+    <div class="main-content padded row-fluid clearfix">
+      <table class="table table-bordered assets">
+        <thead>
+        <tr>
+          <th class="check-cell"><%#<input type="checkbox">
+        # Only single select for time being.
+                                 %></th>
+          <% content_type.columns_for_index.each_with_index do |column, i| %>
+              <th>
+                <% if column[:order] %>
+                    <%= link_to column[:label], sortable_column_path(content_type, column[:order]) %>
+                    <span class='caret'></span>
+                <% else %>
+                    <%= column[:label] %>
+                <% end %>
+              </th>
+          <% end %>
+          <% if (content_type.model_class.respond_to?(:created_by)) %>
+              <th>Created By</th>
+          <% end %>
+          <% if content_type.model_class.connectable? %>
+              <th>Used</th>
+          <% end %>
+        </tr>
+        </thead>
+
+        <tbody>
+        <% @blocks.each do |block| %>
+            <tr>
+              <td class="check-cell"><%= check_box_tag 'content_id[]', block.id %></td>
+              <% content_type.columns_for_index.each_with_index do |column, i| %>
+                  <td>
+                    <%= link_to_if(i == 0, block.send(column[:method]), edit_engine_aware_path(block)) %>
+                    <%= draft_icon_tag(block) if i == 0 %>
+                  </td>
+              <% end %>
+              <% if (content_type.model_class.respond_to?(:created_by)) %>
+                  <td><%= block.created_by.try(:full_name) %></td>
+              <% end %>
+              <% if content_type.model_class.connectable? %>
+                  <td><%= block.connected_pages.size %></td>
+              <% end %>
+            </tr>
+        <% end %>
+        </tbody>
+      </table>
+    </div>
+
+<% end %>
+
+<div class='padded row-fluid clearfix'>
+  <% if !@search_filter.term.blank? && @blocks.size == 0 %>
+    <div class="pagination">No results found for '<%= @search_filter.term %>'</div>
+  <% elsif @blocks.total_pages > 1 %>
+    <%= render_pagination @blocks, content_type, :order => params[:order], :search => @search_filter.term %>
+  <% end %>
+
+</div>

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

@@ -0,0 +1,3 @@
+<% use_page_title "Add a New #{content_type.display_name}" %>
+<%= render 'block_form' %>
+

data/app/views/cms/content_block/render_block_in_main_container.html.erb

@@ -0,0 +1,10 @@
+<% if current_user.able_to_edit?(@block) %>
+    <% content_for :html_head do %>
+        <%= javascript_include_tag 'cms/page_editor' %>
+        <%= stylesheet_link_tag 'cms/page_content_editing' %>
+        <%= csrf_meta_tags %>
+    <% end %>
+<% end %>
+<% content_for :main do %>
+    <%= render file: @block.class.template_path %>
+<% end %>

data/app/views/cms/content_block/show.html.erb

@@ -0,0 +1 @@
+<%= page_content_iframe(url_for engine_aware_path(@block, :inline)) %>

data/app/views/cms/content_block/show_in_isolation.html.erb

@@ -0,0 +1,15 @@
+<% use_page_title "View #{content_type.display_name}" %>
+<%= render layout: 'page_title' do %>
+    <%= link_to 'Edit', edit_engine_aware_path(@block), class: 'btn btn-primary btn-small right' %>
+<% end %>
+<% content_for :sidebar, render('sidebar') %>
+<%= render layout: 'main_with_sidebar' do %>
+    <% if @block.respond_to?(:deleted) && @block.deleted %>
+        <p>This <%= @block.class.name %> has been deleted.</p>
+    <% end %>
+    <% if @block.class.renderable? %>
+        <%= render_connectable(@block) %>
+    <% end %>
+<% end %>
+
+

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

@@ -0,0 +1,24 @@
+<% use_page_title "Versions: '#{@block.name}'" %>
+
+<%= render layout: 'page_title' do %>
+    <%= link_to "Back", :back, class: 'btn btn-small right' %>
+<% end %>
+<%= render layout: 'main_content' do %>
+  <table id="blocks" class="data table table-bordered table-striped table-hover">
+    <thead>
+          <tr>
+            <th>Version</th>
+            <th>Comment</th>
+            <th>Date</th>
+            <th>Editor</th>
+            <th>Action</th>
+          </tr>
+     </thead>
+    <tbody>
+      <% @block.versions.order("version desc").each_with_index do |r, i| %>
+        <%= render partial: 'version', locals: {revision: r, original: @block,  i: i} %>
+    <% end %>
+    </tbody>
+  </table>
+<% end %>
+

data/app/views/cms/dashboard/_page_drafts.html.erb

@@ -1,49 +1,39 @@
-<div class="dashboard_unit" id="page_drafts">
-  <h2 class="left">Page Drafts</h2>
+<div id="page_drafts">
+  <h3>Page Drafts</h3>
 
   <%= form_tag cms.publish_pages_path, :method => :put do %>
-    <div class="roundedcorners" style="position: relative">
-      <table class="data">
+      <table class="data table table-bordered table-rounded">
         <thead>
           <tr>
-            <th class="select first unbordered">&nbsp;</th>
-            <th colspan="2"><div class="dividers">Name</div></th>
-            <th><div class="dividers">User</div></th>
-	          <th class="last" colspan="2">Date</th>
+            <% unless @unpublished_pages.empty? %>
+            <th></th>
+            <% end %>
+            <th>Name</th>
+            <th>User</th>
+	        <th>Date</th>
           </tr>
         </thead>
         <tbody>
           <% if @unpublished_pages.empty? %>
-            <tr><td colspan="3">All pages are published</td></tr>
+            <tr><td colspan="4">All pages are published.</td></tr>
           <% else %>  
             <% @unpublished_pages.each do |page| %>
               <tr>
-                <td class="first"></td>
                 <td class="select"><%= check_box_tag "page_ids[]", page.id, false, :id => "publish_page_#{page.id}" %></td>
                 <td class="name">
-                  <div class="dividers">
                     <%= link_to h(page.name_with_section_path), page.path %>
-                  </div>
                 </td>
                 <td class="updated_by">
-                  <div class="dividers">
                     <%= h(page.updated_by ? page.updated_by.login : nil) %>
-                  </div>
                 </td>
-                <td class="updated_at"><%= page.updated_at.strftime("%b %d") %></td>
-                <td class="last"></td>
+                <td class="updated_at"><%= page.updated_at.strftime("%b %d, %Y") %></td>
               </tr>
             <% end %>
             <tr>
-              <td colspan="5"><%= lt_button_wrapper(submit_tag("Publish Selected", :class => "submit")) %></td>
+              <td colspan="4"><%= submit_tag("Publish Selected", :class => "submit btn btn-mini btn-primary") %></td>
             </tr>
           <% end %>
         </tbody>
       </table>
-      <div class="tl"></div>
-      <div class="tr"></div>
-      <div class="bl"></div>
-      <div class="br"></div>
-    </div>
   <% end %>
 </div>

data/app/views/cms/dashboard/_tasks.html.erb

@@ -1,54 +1,41 @@
-<div class="dashboard_unit" id="tasks">
-  <h2 class="left">Tasks</h2>
-
-  <%= form_tag cms.complete_tasks_path, :method => :put do %>
-    <div class="roundedcorners" style="position: relative">
-      <table class="data">
-        <thead>
+<h3>My Tasks</h3>
+<%= form_tag cms.complete_tasks_path, :method => :put do %>
+    <table class="table table-bordered dashboard">
+      <thead>
+      <tr>
+        <% unless @incomplete_tasks.empty? %>
+            <th></th>
+        <% end %>
+        <th>Page</th>
+        <th>Assigned By</th>
+        <th>Due Date</th>
+      </tr>
+      </thead>
+      <tbody>
+      <% if @incomplete_tasks.empty? %>
           <tr>
-            <th class="select first unbordered">&nbsp;</th>
-            <th colspan="2"><div class="dividers">Name</div></th>
-            <th class="assigned_by"><div class="dividers">Assigned By</div></th>
-	          <th class="due_date">Due Date</th>
-		  <th class="last">&nbsp;</th>
+            <td colspan="4">You currently have no assigned tasks.</td>
           </tr>
-        </thead>
-        <tbody>
-          <% if @incomplete_tasks.empty? %>
-            <tr>
-              <td class="first"></td>
-              <td colspan="3" style="letter-spacing: 1px; height: 30px; padding-top: 10px;">You currently have no assigned tasks. </td>
-	      <td class="last"></td>
-            </tr>
-          <% else %>  
-            <% @incomplete_tasks.each do |task| %>
+      <% else %>
+          <% @incomplete_tasks.each do |task| %>
               <tr>
-                <td class="first"></td>
-                <td class="select">
+                <td>
                   <%= check_box_tag "task_ids[]", task.id, false, :id => "complete_task_#{task.id}" %>
                 </td>
-                <td class="name">
-                  <div class="dividers">
-                    <%= link_to h(task.page.name_with_section_path), task.page.path %>
-                  </div>
+                <td>
+                  <%= link_to h(task.page.name_with_section_path), task.page.path %>
                 </td>
-                <td class="assigned_by">
-                  <div class="dividers"><%=h task.assigned_by.login %></div>
+                <td>
+                  <%= h task.assigned_by.login %>
                 </td>
-                <td class="due_date"><%= task.due_date ? task.due_date.strftime("%b %d") : nil %></td>
-                <td class="last"></td>
+                <td><%= task.due_date ? task.due_date.strftime("%b %d, %Y") : nil %></td>
               </tr>
-            <% end %>
-            <tr>
-              <td colspan="5"><%= lt_button_wrapper(submit_tag("Complete Selected", :class => "submit")) %></td>
-            </tr>
           <% end %>
-        </tbody>
-      </table>
-      <div class="tl"></div>
-      <div class="tr"></div>
-      <div class="bl"></div>
-      <div class="br"></div>
-    </div>
-  <% end %>
-</div>
+          <tr>
+            <td colspan="4"><%= submit_tag("Complete Selected", :class => "submit btn btn-mini btn-primary") %></td>
+          </tr>
+      <% end %>
+      </tbody>
+
+    </table>
+<% end %>