browsercms 3.5.7 → 4.0.0.alpha

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

@@ -1,15 +1,13 @@
-<% page_title "Dashboard" %>
+<% use_page_title "Dashboard" %>
 
-<%= content_for :html_head do %>
-  <%= stylesheet_link_tag('cms/dashboard') %>
-  <%= stylesheet_link_tag('cms/form_layout') %>
-<% end %>
-
-<div class="dashboard_wrap">
-  <%= render :partial => 'page_drafts' %>
-  <%= image_tag "cms/dashboard/bottom_cap.png", :style=>"position: absolute; bottom: -9px; left: 0"%>
+<div class="padded row-fluid clearfix">
+  <h1>Dashboard</h1>
+  <div class="row-fluid">
+    <div class="span6">
+      <%= render :partial => 'tasks' %>
+    </div>
+    <div class="span6">
+      <%= render :partial => 'page_drafts' %>
+    </div>
+  </div>
 </div>
-<div class="dashboard_wrap tasks_margin">  
-  <%= render :partial => 'tasks' %>
-  <%= image_tag "cms/dashboard/bottom_cap.png", :style=>"position: absolute; bottom: -9px; left: 0"%>
-</div>

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

@@ -1,11 +1,9 @@
-<%= content_for :html_head, stylesheet_link_tag('cms/form_layout') %>
-<%= form_for(@view) do |f| %>
-  <%= f.cms_error_messages %>
-  <%= f.cms_text_field :name %>
-  <%= f.cms_text_field :format %>
-  <%= f.cms_drop_down :handler, ActionView::Template.template_handler_extensions, :default => "erb" %>
-  <%= f.cms_text_area :body, :style => "height: 500px" %>
-  <div class="buttons">
-    <%= lt_button_wrapper(f.submit("Save", :class => "submit", :tabindex => next_tabindex)) %>
-  </div>
+<% content_for :buttons, 'save_buttons'  %>
+<%= simple_form_for(@view) do |f| %>
+    <%= render layout: 'form_with_buttons', locals: {f: f} do %>
+        <%= f.input :name, hint: @view.hint, placeholder: @view.placeholder %>
+        <%= f.input :format %>
+        <%= f.input :handler, collection: ActionView::Template.template_handler_extensions, default: "erb" %>
+        <%= f.input :body, as: :text, input_html: {:style => "height: 500px", :cols => 80} %>
+    <% end %>
 <% end %>

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

@@ -1,3 +1,2 @@
-<% @page_title = @toolbar_title = "Edit '#{@view.name}' #{dynamic_view_type.name.titleize}" %>
-<%= content_for :functions, link_to(span_tag("List All"), cms_index_path_for(dynamic_view_type), :class => "button") %>
-<%= render :partial => 'form' %>
+<% use_page_title "Edit '#{@view.name}' #{dynamic_view_type.title}" %>
+<%= render 'form' %>

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

@@ -1,52 +1,30 @@
-<% @page_title = @toolbar_title = "List #{dynamic_view_type.name.demodulize.titleize.pluralize}" %>
-<%= 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/<%= dynamic_view_type.name.demodulize.underscore.pluralize %>/'+id+'/edit');
-        $('#delete_button').removeClass('disabled').attr('href', '/cms/<%= dynamic_view_type.name.demodulize.underscore.pluralize %>/'+id)
-      })
-    })
-  <% end %>
+<% use_page_title "#{dynamic_view_type.name.demodulize.titleize.pluralize}" %>
+<%= render layout: 'page_title' do %>
+    <%= link_to "Add", new_engine_aware_path(dynamic_view_type), class: 'btn btn-primary btn-small right' %>
 <% end %>
-
-<%= content_for :functions do %>
-    <%= add_button cms_new_path_for(dynamic_view_type) %>
-    <%= edit_button  %>
-    <%= delete_button :title => "Are you sure you want to delete this #{dynamic_view_type.name.demodulize.underscore.titleize}?" %>
-<% end %>
-
-<div class="roundedcorners">
-  <table class="data">
-    <tr>
-      <th class="first"></th>
-      <th><div class="dividers">Name</div></th>
-      <th><div>Updated At</div></th>
-      <th class="last"></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>Path</th>
+	      <th>Updated At</th>
+	      <th>Actions</th>
+	    </tr>
+	</thead>
     <% @views.each do |view| %>
-      <tr id="<%= dynamic_view_type.form_name %>_<%= view.id %>">
-        <td class="first"></td>
-        <td><div class="dividers" title="<%=h view.file_path %>"><%=h view.display_name %></div></td>
-        <td><div><%= view.updated_at && view.updated_at.to_s(:date) %></div></td>
-        <td class="last"></td>
+      <tr>
+        <td><%= view.display_name %></td>
+        <td><%= view.path %></td>
+        <td><%= view.updated_at && view.updated_at.to_s(:date) %></td>
+        <td>
+          <%= link_to "Edit", edit_polymorphic_path(view), class: "btn btn-mini" %>
+          <%= link_to "Delete", polymorphic_path(view), class: "btn btn-mini btn-danger", method: 'delete',  data: {confirm: 'Are you sure you want to delete this view?'} %>
+        </td>
       </tr>
     <% end %>
   </table>
-<div class="tl"></div>
-<div class="tr"></div>
-<div class="bl"></div>
-<div class="br"></div>
-</div>
+<% end %>
 <% if @views.size == 0 && params[:key_word]%>
   <div class="pagination">No results found for '<%= params[:key_word] %>'</div>
 <% elsif @views.total_pages > 1 %>

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

@@ -1,3 +1,2 @@
-<% @page_title = @toolbar_title = "New #{dynamic_view_type.name.titleize}" %>
-<%= content_for :functions, link_to(span_tag("List All"), cms_index_path_for(dynamic_view_type), :class => "button") %>
-<%= render :partial => 'form' %>
+<% use_page_title "New #{dynamic_view_type.title}" %>
+<%= render 'form' %>

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

@@ -1,39 +1,36 @@
-<% page_title "Administration / Email Messages" %>
-<% @toolbar_title = "Email Messages" %>
+<% use_page_title "Email Messages" %>
+<%= render layout: 'page_title' do
+end %>
 
-<div class="roundedcorners">
-  <table  class="data" width="100%">
-    <thead>
+<%= render layout: 'main_content' do %>
+    <table class="data table table-striped table-bordered table-hover">
+      <thead>
       <tr>
-        <th class="first" colspan="2"><div class="dividers">To</div></th>
-        <th style="width: 48%;"><div class="dividers">Subject</div></th>
-        <th class="last" colspan="2" style="width: 20%;"><div class="dividers">Delivered</div></th>
-    </tr>
-  </thead>
-  <tbody>
-    <% @messages.each do |message|%>
-      <tr>
-        <td class="first"></td>
-        <td><div class="dividers"><%= link_to h(truncate(message.recipients)),  message %></div></td>
-        <td><div class="dividers"><%= link_to h(truncate(message.subject)), message %></div></td>
-        <td style="white-space: nowrap"><%=h time_on_date(message.delivered_at) %></td>
-	<td class="last"></td>
-      </tr>
-    <% end %>
-    <% if @messages.empty? %>
-      <tr>
-	<td class="first">&nbsp;</td>
-	<td colspan="3" style="height: 30px; padding-top:10px; letter-spacing: 2px;">No email messages.</td>
-	<td class="last">
+        <th>To</th>
+        <th>Subject</th>
+        <th>Delivered</th>
       </tr>
-    <% end %>
-  </tbody>
-</table>
-<div class="tl"></div>
-<div class="tr"></div>
-<div class="bl"></div>
-<div class="br"></div>
-</div>
+      </thead>
+      <tbody>
+      <% @messages.each do |message| %>
+          <tr>
+            <td><%= link_to truncate(message.recipients), message %>
+            </td>
+            <td>
+              <%= message.subject %>
+            </td>
+            <td style="white-space: nowrap"><%= h time_on_date(message.delivered_at) %></td>
+          </tr>
+      <% end %>
+      <% if @messages.empty? %>
+          <tr>
+            <td colspan="3">No email messages.</td>
+          </tr>
+      <% end %>
+      </tbody>
+    </table>
+
+<% end %>
 <% if @messages.total_pages > 1 %>
-  <%= render_pagination @messages, Cms::EmailMessage %>
+    <%= render_pagination @messages, Cms::EmailMessage %>
 <% end %>

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

@@ -1,57 +1,50 @@
-<%= content_for :html_head do %>
-  <style type="text/css">
-    div.field {
-      margin: 10px 0;
-    }
-    div.field div.label {
-      display: inline;
-      font-weight: bold;
-    }
-    div.field div.value {
-      display: inline;
-    }
-  </style>
-<% end %>
-
 <%= content_for :functions do %>
-  <%= link_to span_tag("List All"), cms_email_messages_path, :class => "button" %>
+    <%= link_to span_tag("List All"), cms.email_messages_path, :class => "button" %>
 <% end %>
 
-<% @page_title = @toolbar_title = "Email Message '#{@message.subject}'" %>
-<div class="field">
-  <div class="label">Delivered At:</div> 
-  <div class="value"><%= time_on_date(@message.delivered_at) %></div>
-</div>
-<% unless @message.content_type.blank? %>
-  <div class="field">
-    <div class="label">Content-Type:</div> 
-    <div class="value"><%=h @message.content_type %></div>  
-  </div>
-<% end %>
-<div class="field">
-  <div class="label">From:</div> 
-  <div class="value"><%=h @message.sender %></div>
-</div>
-<div class="field">
-  <div class="label">To:</div> 
-  <div class="value"><%=h @message.recipients %></div>
-</div>
-<% unless @message.cc.blank? %>
-  <div class="field">
-    <div class="label">CC:</div> 
-    <div class="value"><%=h @message.cc %></div>
-  </div>
+<% use_page_title "Email Message" %>
+<%= render layout: 'page_title' do %>
+    <%= link_to "Email Messages", cms.email_messages_path, :class => "btn btn-primary right btn-small" %>
 <% end %>
-<% unless @message.bcc.blank? %>
-  <div class="field">
-    <div class="label">BCC:</div> 
-    <div class="value"><%=h @message.bcc %></div>
-  </div>
+
+<%= render layout: 'main_with_sidebar' do %>
+    <dl>
+      <dt>Delivered At:</dt>
+      <dd><%= time_on_date(@message.delivered_at) %></dd>
+    </dl>
+
+    <% unless @message.content_type.blank? %>
+        <dl>
+          <dt>Content-Type:</dt>
+          <dd><%= h @message.content_type %></dd>
+        </dl>
+    <% end %>
+    <dl>
+      <dt>From:</dt>
+      <dd><%= h @message.sender %></dd>
+    </dl>
+    <dl>
+      <dt>To:</dt>
+      <dd><%= h @message.recipients %></dd>
+    </dl>
+    <% unless @message.cc.blank? %>
+        <dl>
+          <dt>CC:</dt>
+          <dd><%= h @message.cc %></dd>
+        </dl>
+    <% end %>
+    <% unless @message.bcc.blank? %>
+        <dl>
+          <dt>BCC:</dt>
+          <dd><%= h @message.bcc %></dd>
+        </dl>
+    <% end %>
+    <dl>
+      <dt>Subject:</dt>
+      <dd><%= h @message.subject %></dd>
+    </dl>
+    <dl>
+      <dt>Body</dt>
+      <dd><%= h @message.body %></dd>
+    </dl>
 <% end %>
-<div class="field">
-  <div class="label">Subject:</div> 
-  <div class="value"><%=h @message.subject %></div>
-</div>
-<div class="field">
-  <%=h @message.body %>
-</div>

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

@@ -1,5 +1,3 @@
-<%= f.cms_text_field :name %>
-<%= f.cms_file_field :file, :instructions=>"Select a file to upload.", edit_path: true, edit_section: true %>
+<%= f.input :name %>
+<%= f.input :file, hint: "Select a file to upload.", as: :file_picker %>
 <%= f.cms_tag_list %>
-
-

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

@@ -0,0 +1,2 @@
+<%= link_to("#{@entry.form.name} form", form_path(@entry.form), class: "btn btn-small right ") %>
+<%= link_to("New Entry", new_form_entry_path(form_id: @entry.form), class: "btn btn-small btn-primary right") %>

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

@@ -0,0 +1,7 @@
+<%= simple_form_for(model, as: :form_entry, url: url) do |f| %>
+    <%= hidden_field_tag :form_id, model.form.id %>
+    <% model.form.fields.each do |field| %>
+        <%= f.input field.name, field.options(entry: model) %>
+    <% end %>
+    <%= f.button :submit, "Submit" %>
+<% end %>

data/app/views/cms/form_entries/_internal_form.html.erb

@@ -0,0 +1,9 @@
+<% content_for :buttons, 'save_buttons' %>
+<%= simple_form_for(model, as: :form_entry, url: url) do |f| %>
+    <%= render layout: 'form_with_buttons', locals: {f: f} do %>
+        <%= hidden_field_tag :form_id, model.form.id %>
+        <% model.form.fields.each do |field| %>
+            <%= f.input field.name, field.options(entry: model) %>
+        <% end %>
+    <% end %>
+<% end %>

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

@@ -0,0 +1,5 @@
+<% use_page_title "Edit Entry" %>
+<%= render partial: 'internal_form',
+           locals: {model: @entry,
+                    url: cms.form_entry_path(@entry)}
+%>

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

@@ -0,0 +1,3 @@
+<%= content_for :main do %>
+  <%= render file: 'cms/forms/render' %>
+<% end %>

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

@@ -0,0 +1,4 @@
+<% content_for :bulk_actions do %>
+    <%= render 'buttons' %>
+<% end %>
+<%=  render file: 'cms/content_block/index' %>

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

@@ -0,0 +1,5 @@
+<% use_page_title "New Entry for #{@entry.form.name}" %>
+<%= render partial: 'internal_form',
+           locals: {model: @entry,
+                    url: form_entries_path(@entry)}
+%>

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

@@ -0,0 +1,13 @@
+<% use_page_title "View Entry" %>
+
+<%= render partial: 'buttons', layout: 'page_title' %>
+
+
+<%= render layout: 'main_with_sidebar' do %>
+    <dl>
+      <% @entry.form.fields.each do |field| %>
+          <dt><%= field.label %></dt>
+          <dd><%= @entry.data_columns[field.name] %></dd>
+      <% end %>
+    </dl>
+<% end %>

data/app/views/cms/form_entries/submit.html.erb

@@ -0,0 +1 @@
+<%= content_for :main , @form.confirmation_text.html_safe %>

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

@@ -0,0 +1,8 @@
+<%= f.input field.name,
+            label: field.label,
+            hint: field.instructions,
+            wrapper: :append do %>
+    <%= f.input_field field.name, field.options(disabled: true).merge({data: {id: field.id}}) %>
+    <%= link_to("Edit", "#", data: {edit_path: edit_path}, class: "btn edit_form_button") %>
+    <%= link_to("Delete", "#", data: {path: delete_path}, class: "btn delete_field_button") %>
+<% end %>

data/app/views/cms/form_fields/_select.html.erb

@@ -0,0 +1,3 @@
+<%= f.input :choices, hint: "Enter each choice on a separate line." %>
+<%= f.input :required, hint: "Required fields will show the first option a preselected." %>
+<%= f.input :instructions, as: :text %>

data/app/views/cms/form_fields/_text_area.html.erb

@@ -0,0 +1,3 @@
+<%= f.input :required %>
+<%= f.input :instructions, as: :text %>
+<%= f.input :default_value %>

data/app/views/cms/form_fields/_text_field.html.erb

@@ -0,0 +1,3 @@
+<%= f.input :required %>
+<%= f.input :instructions, as: :text %>
+<%= f.input :default_value %>

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

@@ -0,0 +1,26 @@
+<div class="modal-header">
+  <button type="button" class="close" data-dismiss="modal" aria-hidden="true">×</button>
+  <h3>Edit Field</h3>
+</div>
+<div class="modal-body">
+  <%= simple_form_for(@field, html: {id: 'ajax_form_field'}) do |f| %>
+      <%= f.hidden_field :form_id %>
+      <%= f.hidden_field :field_type %>
+      <%= f.input :label, hint: @field.new_record? ? "" : "Will not change the database name (i.e. '#{@field.name}') for new or existing entries. ", autofocus: true %>
+      <%= render partial: @field.field_type, locals: {f: f, field: @field} %>
+      <%= f.button :submit, "Save", style: 'display: none' %>
+  <% end %>
+</div>
+<div class="modal-footer">
+  <a class="btn btn-primary" href="#" id="create_field" data-dismiss="modal" type="button">Save</a>
+  <a aria-hidden="true" class="btn" data-dismiss="modal" href="#" type="button">Never Mind</a>
+</div>
+
+<%#
+    I would prefer to do this on shown.bs.modal event but that doesn't seem to work.
+    Doing it here guarantees the #create_field exists before we add the click to it.
+  %>
+<script type="text/javascript">
+ $("#create_field").on('click', formBuilder.createField);
+ formBuilder.onEnterSubmitFormViaAjax();
+</script>

data/app/views/cms/form_fields/preview.html.erb

@@ -0,0 +1,16 @@
+<%= simple_form_for(@form) do |f| %>
+    <%= f.simple_fields_for :new_entry do |e| %>
+        <%
+           locals = {f: e,
+                     field: @field,
+                     edit_path: new_form_field_path(form_id: @form.id, field_type: @field.field_type)
+           }
+           if @field.persisted?
+             locals[:delete_path] = form_field_path(@field.id)
+           else
+             locals[:delete_path] = ""
+           end
+        %>
+        <%= render partial: 'cms/form_fields/form', locals: locals %>
+    <% end %>
+<% end %>