browsercms 3.5.7 → 4.0.0.alpha

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

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

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

@@ -1,9 +1,9 @@
-<% page_title "Rails Routes" %>
-<%= content_for :functions do %>
-  <h1><%=h page_title %></h1>
+<% use_page_title "Rails Routes" %>
+<%= render layout: 'page_title' do %>
+    <%= link_to "Page Routes", page_routes_path, class: 'btn btn-primary right' %>
 <% end %>
 
-<div style="margin: 10px 0">
+<div class="padded row-fluid">
   <%= form_tag routes_path, :method => :get do %>
     <label>
       Path to Test: <%= text_field_tag :path, @path, :size => 50 %>
@@ -15,26 +15,21 @@
     <% end %>
   <% end %>
 </div>
-<div class="roundedcorners">
-<table class="data">
-  <tr>
-    <th class="first" colspan="2"><div class="dividers">Name</div></th>
-    <th><div class="dividers" style="width: 50px;">Verb</div></th>
-    <th><div class="dividers">Pattern</div></th>
-    <th class="last" colspan="2"><div class="dividers">Result</div></th>
-
-  </tr>
+<%= render layout: 'main_content' do %>
+<table class="data cms-content-table table table-striped table-bordered table-hover">
+  <thead>  
+	  <tr>
+	    <th>Name</th>
+	    <th>Verb</th>
+	    <th>Pattern</th>
+        <th>Result</th>
+	  </tr>
+  </thead>
   <% for route in @routes %><tr>
-    <td class="first"></td>
     <td><%=h route[:name] %></td>
     <td><%=h route[:verb] %></td>
     <td><%=h route[:segs] %></td>
     <td><%=h route[:reqs] %></td>
-    <td class="last"></td>
   </tr><% end %>
 </table>
-<div class="tl"></div>
-<div class="tr"></div>
-<div class="bl"></div>
-<div class="br"></div>
-</div>
+  <% end %>

data/app/views/cms/section_nodes/_children.html.erb

@@ -0,0 +1,3 @@
+<% children.keys.each do |section_node| %>
+    <%= render partial: 'section_node', locals: {section_node: section_node, parent: parent, children: children[section_node]} %>
+<% end %>

data/app/views/cms/section_nodes/_row_buttons.html.erb

@@ -0,0 +1,11 @@
+<ul class="edit-group">
+  <li><%= link_to 'View', engine_aware_path(section_node.node), class: 'add-link' unless section_node.root? %></li>
+  <li><%= link_to 'Edit', edit_engine_aware_path(section_node.node), class: 'add-link' %></li>
+  <!--<% if section_node.page? %>-->
+  <!--<li><a href="#" class="add-link">Archive</a></li>-->
+  <!--<% end %>-->
+  <!--<li><%= link_to("Hide", "#", class: 'add-link') unless section_node.root? %></li>-->
+  <li><%= link_to 'Remove', engine_aware_path(section_node.node),
+                  class: 'add-link http_delete confirm_with_title',
+                  title: "Are you sure you want to remove #{section_node.node.name}?" unless section_node.root? %></li>
+</ul>

data/app/views/cms/section_nodes/_section_node.html.erb

@@ -1,10 +1,24 @@
-<% r = defined?(root) %>
-<% if section_node.node && %w[Cms::Link Cms::Page Cms::Section].include?(section_node.node_type) %>
-  <%= render :partial => section_node.node_type.demodulize.underscore, :locals => { 
-      :section_node => section_node,
-      :node => section_node.node, 
-      :display => display,
-      :root => r
-    } 
-  %>
-<% end %>
+<ul class="nav nav-list <%= initial_visibility_class(section_node) %>">
+  <li class="nav-list-item">
+    <span class="nav-list-span <%= sitemap_depth_class(section_node) %> <%= draggable_class?(@modifiable_sections, section_node, parent) %>"
+          data-id="<%= section_node.id %>"
+          data-depth="<%= section_node.depth + 1 %>"
+          data-type="<%= row_type_tag(section_node) %>"
+          data-closable="<%= closable_data(section_node, children) %>"
+          data-add-page-path="<%= add_page_path_data(section_node, parent) %>"
+          data-add-link-path="<%= add_link_path_data(section_node, parent) %>"
+          data-add-section-path="<%= add_section_path_data(section_node, parent) %>"
+    >
+        <span class="text">
+          <%= icon_tag(section_node, children) %>
+          <%= section_node.node.name %>
+        </span>
+
+      <% if current_user_can_modify(@modifiable_sections, section_node, parent) %>
+        <%= render partial: 'row_buttons', locals: {section_node: section_node} %>
+      <% end %>
+      <%= render partial: 'status', locals: {parent: parent.node, content: section_node.node} if parent %>
+    </span>
+    <%= render partial: 'children', locals: {parent: section_node, children: children} %>
+  </li>
+</ul>

data/app/views/cms/section_nodes/_sitemap_buttons.html.erb

@@ -0,0 +1,47 @@
+<div class="padded row-fluid clearfix">
+  <% use_page_title "Sitemap" %>
+  <h1 class="span3"><%= page_title %></h1>
+  <%# Design called for the following buttons. Still need to be implemented but are left here commented out for time being. %>
+  <%#
+  <span class="span9 top-buttons">
+    <div class="btn-group right">
+      <button class="btn btn-small btn-primary" tabindex="-1">Add</button>
+      <button class="btn btn-small btn-primary dropdown-toggle" data-toggle="dropdown" tabindex="-1">
+        <span class="caret"></span>
+      </button>
+
+      <ul class="dropdown-menu pull-right">
+        <li><a href="#">Page</a></li>
+        <li><a href="#">Section</a></li>
+
+        <li class="divider"></li>
+
+        <li><a href="#">Product</a></li>
+
+        <li class="divider"></li>
+
+        <li><a href="#">File</a></li>
+        <li><a href="#">Text</a></li>
+        <li><a href="#">Image</a></li>
+        <li><a href="#">Portlet</a></li>
+      </ul>
+    </div>
+
+    <div class="btn-group right">
+      <button type="submit" class="btn btn-small">Expand All</button>
+      <button type="submit" class="btn btn-small">Collapse All</button>
+    </div>
+
+    <form class="form-inline right clearfix">
+      <label for="inputEmail">Show:</label>
+      <select class="show-sort">
+        <option>All</option>
+        <option>Slides</option>
+        <option>Portlets</option>
+        <option>Events</option>
+        <option>Articles</option>
+      </select>
+    </form>
+  </span>
+  %>
+</div>

data/app/views/cms/section_nodes/_status.html.erb

@@ -0,0 +1,5 @@
+<div class="permission-group">
+  <%= draft_icon_tag(content) %>
+  <%= hidden_icon_tag(content) %>
+  <%= guest_accessible_icon_tag(parent, content) %>
+</div>

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

@@ -0,0 +1,9 @@
+<%= render 'sitemap_buttons' %>
+<div class="main-content padded row-fluid clearfix">
+  <div id="sitemap">
+    <%= render partial: 'section_node', locals: {section_node: @root_section_node,
+                                                 parent: nil,
+                                                 children: @sitemap[@root_section_node]} %>
+  </div>
+</div>
+

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

@@ -0,0 +1,6 @@
+<%= button_menu location do %>
+    <%= f.button :save, location: location %>
+    <div class="btn-group right">
+      <%= cancel_button location %>
+    </div>
+<% end %>

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

@@ -1,57 +1,30 @@
-<%= content_for :html_head, stylesheet_link_tag('cms/form_layout') %>
-<%= f.cms_error_messages %>
-
-<%= f.cms_text_field :name %>
-<%= f.cms_text_field :path %>
-
-<div class="checkbox_group fields no_check_all">
-  <div class="checkbox_fields">
-    <%= f.label :hidden, "Hide from menus?" %>
-    <%= f.check_box :hidden, :tabindex => next_tabindex %>
-  </div>
-</div>
-
-<%= able_to?(:administrate) do %>
-  <div class="checkbox_group fields" style="float: left; width: 100%">
-    <label>Public Permissions</label>
-    <%= hidden_field_tag "section[group_ids][]", "", :id => nil %>
-    <div class="checkboxes">
-      <% for group in public_groups %>
-      <div class="checkbox_fields">
-        <%= check_box_tag "section[group_ids][]", group.id,
-              @section.groups.include?(group), :class => "public_group_ids", :id => "public_group_ids_#{group.id}", :tabindex => next_tabindex %>
-          <label for="public_group_ids_<%= group.id %>"><%= group.name %></label>
-      </div>
-      <% end %>
-      <div class="instructions">Which &ldquo;Public&rdquo; groups can view pages in this section?</div>
+<%= page_title_with_buttons f %>
+<div class="padded row-fluid clearfix">
+  <%= f.input :name, slug_source_if(f.object.new_record?) %>
+  <%= f.input :path, input_html: {class: 'slug-dest', data: {prefix: parent.path}} if parent %>
+  <%= f.input :hidden, label: "Hide from menus?" if parent %>
+  <%= able_to?(:administrate) do %>
+      <%= f.association :groups,
+                        collection: public_groups,
+                        as: :check_boxes,
+                        label: 'Public Permissions',
+                        input_html: {class: "public_group_ids"},
+                        hint: 'Which "Public" groups can view pages in this section?'
+      %>
       <div class="check_uncheck">
         <%= check_uncheck_tag 'input.public_group_ids' %>
       </div>
-    </div>
-  </div>
-
-  <br clear="all" />
 
-  <div class="checkbox_group fields" style="float: left; width: 100%">
-    <label>CMS Permissions</label>
-    <%= hidden_field_tag "section[group_ids][]", "", :id => nil %>
-    <div class="checkboxes">
-      <% for group in cms_groups %>
-      <div class="checkbox_fields">
-          <%= check_box_tag "section[group_ids][]", group.id,
-              @section.groups.include?(group), :class => "cms_group_ids", :id => "cms_group_ids_#{group.id}", :tabindex => next_tabindex %>
-          <label for="cms_group_ids_<%= group.id %>"><%= group.name %></label>
-      </div>
-      <% end %>
-      <div class="instructions">Which &ldquo;CMS&rdquo; groups can edit pages and content in this section?</div>
+      <%= f.association :groups,
+                        collection: cms_groups,
+                        as: :check_boxes,
+                        label: 'CMS Permissions',
+                        input_html: {class: "cms_group_ids"},
+                        hint: 'Which "CMS" groups can edit pages and content in this section?'
+      %>
       <div class="check_uncheck">
         <%= check_uncheck_tag 'input.cms_group_ids' %>
       </div>
-    </div>
-  </div>
-  <br clear="all" />
-<% end %>
-
-<div class="buttons">
-  <%= lt_button_wrapper(f.submit("Save", :class => "submit", :tabindex => next_tabindex)) %>
+  <% end %>
 </div>
+<%= bottom_buttons f %>

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

@@ -1,9 +1,4 @@
-<% page_title "Edit Properties / '#{h(@section.name)}' Section" %>
-<%= 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(@section) do |f| %>
-  <%= render :partial => 'form', :locals => {:f => f} %>
+<% use_page_title "Edit Section" %>
+<%= simple_form_for(@section) do |f| %>
+  <%= render :partial => 'form', :locals => {:f => f, :parent => @section.parent, title: 'Edit Section'} %>
 <% end %>

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

@@ -1,21 +1,5 @@
-<%= content_for :html_head do %>
-<script type="text/javascript">
-jQuery(function($){
-  $("#section_name").keyup(function(){
-    var section_path = "<%= @parent.path %>".replace(/\/$/, '')
-    $("#section_path").val(section_path + "/" + $.cms.slug($(this).val()))
-  })
-})
-</script>
-<% end %>
-<% page_title "New Section" %>
-<%= content_for :functions  do %>
-<%= "<h1>#{ @page_title }</h1>" %> 
-<%= link_to(span_tag("list all"), sitemap_path, :class => "button") %>
-<br clear="all"/>
-<% end %>
-<%= form_for(@section, :id => 'section_form') do |f| %>
-  <%= hidden_field_tag :section_id, @parent.id %>
-  
-  <%= render :partial => 'form', :locals => {:f => f} %>
+<% use_page_title "Add a New Section" %>
+<%= simple_form_for(@section, :id => 'section_form') do |f| %>
+    <%= hidden_field_tag :section_id, @parent.id %>
+    <%= render :partial => 'form', :locals => {:f => f, :parent => @parent, title: 'Add a New Section'} %>
 <% end %>

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

@@ -1,32 +1,17 @@
-<% page_title "CMS Login" %>
-<%= content_for :html_head do %>
-  <%= javascript_tag do %>
-      jQuery(function($){
-        $('#login_button').hover(function(){
-          $('#login_button').css('background-image', 'url(<%= asset_path "cms/buttons/button_cap_h.png" %>)');
-          $('#login_button > input').css('background-image', 'url(<%= asset_path "cms/buttons/button_h.png" %>)');
-        }, function(){
-          $('#login_button').css('background-image', 'url(<%= asset_path "cms/buttons/button_cap.png" %>)');
-          $('#login_button > input').css('background-image', 'url(<%= asset_path "cms/buttons/button.png" %>)');
-  })});
-  <% end %>
-<% end %>
+<% use_page_title 'Sign in' %>
+<%= render 'cms/application/page_title' %>
+
+  <%= simple_form_for(resource, :as => resource_name, :url => session_path(resource_name)) do |f| %>
+      <%=  render layout: 'cms/application/main_with_sidebar' do  %>
+        <%= f.input :login, :required => false, :autofocus => true %>
+        <%= f.input :password, :required => false %>
+        <%= f.input :remember_me, :as => :boolean if devise_mapping.rememberable? %>
 
-<% @login ||= "Username" %>
-<% @password ||= "Password" %>
-<%= form_tag cms.login_path, :id => 'login_form' do %>
-  <div class="field">
-    <%= text_field_tag 'login', @login, :onfocus => "if(this.value == 'Username') this.value = '';", :onblur => "if(this.value == '') this.value = 'Username';", :tabindex => 1 %>
-  </div>
-  <div class="field">
-    <%= password_field_tag 'password', @password, :onfocus => "if(this.value == 'Password') this.value = '';", :onblur => "if(this.value == '') this.value = 'Password';", :tabindex => 2 %>
-  </div>
-  <div class="buttons">
-    <div id="login_button"><%= submit_tag("LOGIN") %></div>
-  <div id="remember_me_div">
-    <%= label_tag 'remember_me', 'Remember me', :class => "inline" %>
-   <%= check_box_tag 'remember_me', '1', @remember_me, :tabindex => 3 %>
-   <br clear="all" />
-  </div>
-  </div>
-<% end %>
+      <% end %>
+      <%= render layout: 'cms/application/row' do %>
+          <%= button_menu :bottom do %>
+              <%= f.button :submit, "Sign in", class: 'right btn-primary' %>
+          <% end %>
+      <% end %>
+  <% end %>
+<%= render "devise/shared/links" %>

data/app/views/cms/shared/access_denied.html.erb

@@ -1,3 +1,2 @@
-<% page_title "Access Denied" %>
-<%= content_for :functions, "<h1>#{ @page_title }</h1>" %>
+<% use_page_title "Access Denied" %>
 <p>Sorry, you do not have permission to access this page.</p>

data/app/views/cms/shared/error.html.erb

@@ -1,4 +1,4 @@
-<% page_title "Error: #{exception.class}" %>
+<% use_page_title "Error: #{exception.class}" %>
 
 <%# 
   Note that we have to clear out the existing contents of
@@ -7,9 +7,6 @@
   set in those variables
 %>
 
-<% @content_for_functions = "" %>
-<%= content_for :functions, "<h1>#{ @page_title }</h1>" %>
-
 <% @content_for_html_head = "" %>
 <%= content_for :html_head do %>
   <style type="text/css">
@@ -32,7 +29,10 @@
   </style>
 <% end %>
 
-<div class="cms_error">
+<%= render layout: 'cms/application/page_title' do %>
+    <%= link_to "Back", :back, class: 'btn btn-small right' %>
+<% end %>
+<div class="cms_error padded row-fluid">
   <h2>Message</h2>
   <pre><%=h exception.message %></pre>
   <h2>Stacktrace</h2>

data/app/views/cms/sites/_flash.html.erb

@@ -0,0 +1,8 @@
+<%
+   flash.each do |name, msg|
+%>
+    <%= content_tag :div, class: 'flash-message' do %>
+        <button type="button" class="close" data-dismiss="alert">&times;</button>
+        <%= msg %>
+    <% end %>
+<% end -%>

data/app/views/cms/sites/passwords/new.html.erb

@@ -0,0 +1,2 @@
+<%= render 'cms/sites/flash' %>
+<%= render file: 'devise/passwords/new' %>

data/app/views/cms/sites/sessions/new.html.erb

@@ -0,0 +1,2 @@
+<%= render 'cms/sites/flash' %>
+<%= render file: 'cms/sessions/new' %>

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

@@ -1 +1 @@
-<%= f.cms_text_field :name %>
+<%= f.input :name %>

data/app/views/cms/tags/render.html.erb

@@ -1,5 +1,4 @@
 <%= content_for :html_head do %>
-    <%= stylesheet_link_tag "cms/content_library" %>
     <%= javascript_tag do %>
       jQuery(function($){
         $('#block_content .header').html("Content tagged with '<%= escape_javascript(h(@content_block.name)) %>'")

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

@@ -1,36 +1,22 @@
-<%= content_for :html_head do %>
-  <%= stylesheet_link_tag 'cms/form_layout' %>
+<% use_page_title "Assign Task" %>
+<% content_for :buttons, 'save_buttons' %>
+<% content_for :sidebar do %>
+    <div class="sidebar-block">
+      <h4 class="gray">Assigning Page:</h4>
+      <p><%= link_to @page.name, page_path(@page), target: '_blank' %></p>
+    </div>
 <% end %>
+<%= simple_form_for(@task, :url => @task.new_record? ? page_tasks_path(@page) : page_task_path(@page, @task)) do |f| %>
+    <%= render layout: 'form_with_buttons', locals: {f: f} do %>
+        <%= f.association :assigned_to,
+                          label: "Assign To",
+                          collection: Cms::User.active.able_to_edit_or_publish_content.order("first_name, last_name, login"),
+                          include_blank: false,
+                          label_method: :full_name_with_login
+        %>
+        <%= f.input :due_date, as: :date_picker, hint: "Leave blank for no due date" %>
+        <%= f.input :comment %>
 
-<% page_title "Assign Page '#{@page.name}'" %>
-<%= content_for :functions do %>
-  <h1><%=h @page_title %></h1>
-  <%= link_to(span_tag("Back To Page"), @page.path, :class => "button") %>
-  <br clear="all"/>
-<% end %>
-
-<%= form_for(@task, :url => @task.new_record? ? page_tasks_path(@page) : page_task_path(@page, @task)) do |f| %>
-
-  <%= f.cms_error_messages %>
-  <div class="fields text_fields">
-    <%= f.label :assigned_to_id, "Assign To" %>
-    <%= f.collection_select :assigned_to_id, Cms::User.active.able_to_edit_or_publish_content.all(:order => "first_name, last_name, login"), :id, :full_name_with_login, :include_blank => true, :tabindex => next_tabindex %>
-  </div>
-  
-  <div class="fields text_fields">
-      <%= f.label :due_date %>
-      <%= f.date_picker :due_date %>
-      <div class="instructions">Leave blank for no due date</div><br clear="all" />
-  </div>  
-  
-  <div class="fields text_editor_fields">
-    <%= f.label :comment %>
-    <br/>
-    <%= f.text_area :comment, :tabindex => next_tabindex %>
-  </div>
-
-  <div class="buttons">
-    <%= lt_button_wrapper(f.submit("Save", :class => "submit", :tabindex => next_tabindex)) %>
-  </div>
+    <% end %>
 <% end %>