browsercms 3.5.7 → 4.0.0.alpha

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

@@ -0,0 +1,66 @@
+<% if cleanup_before_abandoning %>
+    <span id="cleanup-before-abandoning" data-path="<%= form_path(@block) %>"></span>
+<% end %>
+
+<h3>Form Settings</h3>
+<%= f.input :name, as: :cms_text_field %>
+<%= f.input :slug, as: :path %>
+<%= f.input :description %>
+<%= hidden_field_tag "field_ids", @block.field_ids %>
+<%= f.input :confirmation_behavior, label: "On Confirmation",
+            collection: [["Show Text", :show_text], ['Redirect to Website', :redirect]],
+            as: :radio_buttons %>
+<%= f.input :confirmation_text, label: false %>
+<%= f.input :confirmation_redirect, label: false, hint: "A complete URL (i.e. http://www.yoursite.com/registration) or relative path (/thanks-for-registering)." %>
+<%= f.input :notification_email, placeholder: 'email@example.com', label: "Notification Email", hint: "Notify this email address when an entry is created. (Leave blank for no notification)" %>
+
+<h3> Preview</h3>
+<div id="form-preview">
+  <% if @block.new_record? %>
+      <div id="no-field-instructions">
+        No fields yet! This <b>live preview</b> of your form will show you fields as you add them. Choose a field type
+        below.
+      </div>
+  <% end %>
+  <%= f.simple_fields_for :new_entry do |e| %>
+      <% @block.fields.each do |field| %>
+          <%= render partial: 'cms/form_fields/form',
+                     locals: {f: e, field: field, edit_path: edit_form_field_path(field.id), delete_path: form_field_path(field.id)} %>
+      <% end %>
+  <% end %>
+  <span id="placeHolder" data-new-path="<%= preview_form_field_path(@block) %>"></span>
+</div>
+
+<%= f.simple_fields_for :new_entry do |e| %>
+    <%= e.input :new_field,
+                label: "Add New Field",
+                prompt: "Select a field type:",
+                collection: [["Text Field", :text_field], ["Text Box", :text_area], ["Dropdown", :select]],
+                input_html: {class: 'add-new-field'}
+    %>
+<% end %>
+<%# Can't have a form inside a form, so this must go into the head. %>
+<%= content_for :html_head do %>
+    <div id="modal-edit-field" class="modal modal-content" tabindex="-1" role="dialog" aria-labelledby="model_label" aria-hidden="true">
+    </div>
+
+    <div id="modal-confirm-delete-field" class="modal modal-content" tabindex="-1" role="dialog" aria-labelledby="model_label" aria-hidden="true">
+      <div class="modal-header">
+        <button type="button" class="close" data-dismiss="modal" aria-hidden="true">×</button>
+        <h3>Delete Field</h3>
+      </div>
+      <div class="modal-body">
+        <p>Are you sure you want to delete this field?</p>
+      </div>
+      <div class="modal-footer">
+        <a class="btn btn-primary" href="#" id="delete_field" data-dismiss="modal" type="button">Yes. Remove this field.</a>
+        <a aria-hidden="true" class="btn" data-dismiss="modal" href="#" type="button">Never Mind</a>
+      </div>
+    </div>
+<% end %>
+
+<% content_for :sidebar_actions do %>
+    <div class="btn-group">
+        <%= link_to "Entries", cms.entries_path(@block), class: "btn btn-small" %>
+    </div>
+<% end %>

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

@@ -0,0 +1,15 @@
+<% content_for :html_head do %>
+    <%= stylesheet_link_tag Rails.application.config.cms.form_builder_css %>
+<% end %>
+<h1><%= @content_block.name %></h1>
+<p>
+  <%= @content_block.description %>
+</p>
+<%
+   unless @entry
+     @entry = Cms::FormEntry.for(@content_block)
+   end
+%>
+<%= render partial: 'cms/form_entries/form', locals: {model: @entry, url: cms.submit_form_entries_path, form: @content_block} %>
+
+

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

@@ -0,0 +1,6 @@
+<% content_for :page_buttons do %>
+    <div class="btn-group">
+    <%= link_to("Entries", cms.entries_path(@block), class: "btn btn-small") %>
+    </div>
+<% end %>
+<%= render file: 'cms/content_block/show' %>

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

@@ -1,44 +1,38 @@
 <%= content_for :html_head do %>
-  <%= stylesheet_link_tag('cms/form_layout') %>
-  <style type="text/css">
-    .checkbox_group .checkboxes .instructions {
-      padding-bottom: 10px;
-    }
-  </style>
-  <%= javascript_tag do %>
-    jQuery(function($) {
-      $('#group_group_type_id').selectbox();
-    });
-  <% end %>
-<% end %>
+    <%# Hide permissions based on whether is a CMS User group or not.  %>
+    <%= javascript_tag do %>
 
-<%= content_for :functions do %>
-  <%= link_to(span_tag("List All"), groups_path,
-    :id => "list_all_button", 
-    :class => "button") %>
+        jQuery(function($){
+            var element = $('#group_group_type_id');
+            var cms_access_group_ids = <%= Cms::GroupType.cms_access.to_a.map { |e| e.id.to_s }.to_json.html_safe %>
+            element.change(function() {
+                if ($.inArray(element[0].value, cms_access_group_ids) < 0) {
+                    $('#permissions').hide();
+                    $('#section-action').text('view');
+                } else {
+                    $('#permissions').show();
+                    $('#section-action').text('edit');
+                }
+            }).change();
+        });
+    <% end %>
 <% end %>
 
-<%= form_for @group do |f| %>
-  <%= f.cms_error_messages %>
-  <div class="fields text_fields">
-    <%= f.label :name, "Group Name" %>
-    <%= f.text_field :name %>
-  </div>
-
-  <% unless @group.guest? %>
-    <div class="fields select_fields">
-    	<%= f.label :group_type_id, "Type of User" %>
-    	<div><%= f.select :group_type_id, Cms::GroupType.non_guest.map { |g| [g.name, g.id] } %></div>
-    	<div class="instructions">What kind of user does this group represent?</div>
-  	<br clear="all" />
-    </div>
-  <% end %>
-
-  <%= render :partial => 'permissions' %>
-  <%= render :partial => 'sections' %>
-
-  <div class="buttons">
-    <%= lt_button_wrapper(f.submit("Save", :class => "submit")) %>
-  </div>
+<%= simple_form_for @group do |f| %>
+    <%=  page_title_with_buttons(f, 'save_buttons') %>
+    <%= render layout: 'main_with_sidebar' do %>
+    <%= f.input :name, label: "Group Name" %>
+    <% unless @group.guest? %>
+        <%= f.association :group_type,
+                    collection: Cms::GroupType.non_guest,
+                    label: 'Type of User',
+                    hint: 'What kind of user does this group represent?',
+                    include_blank: false
+        %>
+    <% end %>
 
+    <%= render :partial => 'permissions', locals: {f: f} %>
+    <%= render :partial => 'sections', locals: {f: f} %>
+    <% end %>
+    <%= bottom_buttons f,  'save_buttons' %>
 <% end %>

data/app/views/cms/groups/_permissions.html.erb

@@ -1,37 +1,14 @@
-<%= content_for :html_head do %>
-  <%= javascript_tag do %>
-    jQuery(function($){
-      var cms_access_group_ids = <%= Cms::GroupType.cms_access.all.map{|e| e.id.to_s}.to_json.html_safe %>
-      $('#group_group_type_id').change(function() {
-        if ($.inArray($('#group_group_type_id')[0].value, cms_access_group_ids) < 0) {
-          $('#permissions').hide()
-          $('#section-action').text('view')
-        } else {
-          $('#permissions').show()
-          $('#section-action').text('edit')          
-        }
-      }).change()      
-    });
-  <% end %>
-  
-<% end %>
 <div id="permissions">
-  <div class="checkbox_group">
-    <label>Global Permissions</label>
-    <%= hidden_field_tag "group[permission_ids][]", "" %>  
-    <div class="checkboxes">
-    <% Cms::Permission.all(:order => "name").each do |p| %>
-      <div class="checkbox_fields">
-          <%= check_box_tag "group[permission_ids][]", p.id, @group.permissions.include?(p), :id => "permission_ids_#{p.id}", :class => "permission_ids" %>
-          <label for="permission_ids_<%= p.id %>" style="width: 400px;#padding-top: 6px;"><%=h p.full_name %></label>
-      </div>
-      <div class="instructions"><%=h p.description %></div>
-    <% end %>
-    <div class="check_uncheck">
-      <%= check_uncheck_tag 'input.permission_ids' %>
-    </div>
+    <%= f.association :permissions,
+                      collection: Cms::Permission.order(:name),
+                      as: :check_boxes,
+                      label: 'Global Permissions',
+                      label_method: lambda { |permission| "#{permission.full_name} (#{permission.description})"},
+                      :input_html => { :class => "check_uncheck" }
+                      # Note: Check/uncheck only works once, and was not broken by this refactoring.
+    %>
+  <div class="check_uncheck">
+    <%= check_uncheck_tag 'input.check_uncheck' %>
   </div>
-    <br clear="all" />
-  <div style="clear: all; margin-top: -10px;"></div>
-    </div>
 </div>
+

data/app/views/cms/groups/_sections.html.erb

@@ -1,18 +1,12 @@
-<div class="checkbox_group fields">
-  <label>Section Permissions</label>
-  <%= hidden_field_tag "group[section_ids][]", "" %>
-  <div class="checkboxes">
-  <% Cms::Section.all(:order => "path").each do |s|%>
-  <div class="checkbox_fields">
-    <%= check_box_tag "group[section_ids][]", s.id, @group.sections.include?(s), :id => "section_ids_#{s.id}", :class => "section_ids" %>
-    <label for= "section_ids_<%= s.id %>" style="width: 400px; padding-top: 0; #padding-top: 4px;"><%=h s.name %><span style="padding-top: 0; font-weight: lighter; display: inline; float: none;">(Path: <%=h s.path %>)</span></label>
-  </div>
-  <% end %>
-  <div class="instructions">What sections should group members be allowed to <span id="section-action"><%= @group.cms_access? ? 'edit' : 'view' %></span>?</div>
-  <div class="check_uncheck">
-    <%= check_uncheck_tag 'input.section_ids' %>
-  </div>
-  </div>
-  <br clear="all" />
-  <div style="clear: all;"></div>
+
+<%= f.association :sections,
+                  collection: Cms::Section.order(:path),
+                  as: :check_boxes,
+                  label: 'Section Permissions',
+                  label_method: lambda { |s| "#{s.name} (Path: #{s.path})"},
+                  hint: "What sections should group members be allowed to <span id='section-action'>#{@group.cms_access? ? 'edit' : 'view'}</span>?".html_safe,
+                  :input_html => { :class => "section_ids" }
+%>
+<div class="check_uncheck">
+<%= check_uncheck_tag 'input.section_ids' %>
 </div>

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

@@ -1,4 +1,2 @@
-<% page_title "Administration / Add New Group" %>
-<% @toolbar_title = "Add New Group" %>
-
+<% use_page_title "Edit Group" %>
 <%= render :partial => 'form' %>

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

@@ -1,41 +1,24 @@
-<% page_title "Administration / Group Browser" %>
-<% @toolbar_title = "List Groups" %>
-
-<%= content_for :functions do %>
-  <%= link_to(span_tag("Add Group"), new_group_path,
-    :id => "new_group_button", :class => "button") %>
+<% use_page_title "Groups" %>
+<%= render layout: 'page_title' do %>
+    <%= link_to("Add Group", new_group_path, :id => "new_group_button", :class => "btn btn-primary btn-small right") %>
 <% end %>
-
-<div class="roundedcorners">
-  <table class="data">
+<%= render layout: 'main_content' do %>
+  <table class="data table table-rounded table-bordered table-hover table-striped">
     <thead>
       <tr>
-        <th colspan="2" class="first">
-          <div class="dividers">
-            <%= link_to "Name", groups_path(:order => determine_order(params[:order], "#{Cms::Group.table_name}.name")) %>
-          </div>
-        </th>
-        <th>
-          <div class="dividers">
-            <%= link_to "Type", groups_path(:order => determine_order(params[:order], "#{Cms::GroupType.table_name}.name")) %>
-          </div>
-        </th>
-        <th colspan="2" class="last"><div class="dividers">Permissions</div></th>
+        <th><%= link_to "Name", groups_path(:order => determine_order(params[:order], "#{Cms::Group.table_name}.name")) %></th>
+        <th><%= link_to "Type", groups_path(:order => determine_order(params[:order], "#{Cms::GroupType.table_name}.name")) %></th>
+        <th>Permissions</th>
       </tr>
     </thead>
     <% section_count = Cms::Section.count %>
     <% @groups.each do |g| %>
       <tr>
-        <td class="first"></td>
         <td>
-          <div class="dividers">
             <%= link_to h(g.name), [:edit, g] %>
-          </div>
         </td>
         <td>
-          <div class="dividers">
             <%= h(g.group_type.name) %>
-          </div>
         </td>
         <td>
           <% g.permissions.uniq.each do |p| %>
@@ -44,15 +27,10 @@
           - <%= g.cms_access? ? "Edit" : "View" %>
           <%= g.sections.count >= section_count ? "All Sections" : "#{g.sections.count} of #{section_count} Sections" %>
         </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 %>
 <% if @groups.total_pages > 1 %>
   <%= render_pagination @groups, Cms::Group %>
-<% end %>
+<% end %>

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

@@ -1,4 +1,2 @@
-<% page_title "Administration / Add New Group" %>
-<% @toolbar_title = "Add New Group" %>
-
-<%= render :partial => 'form' %>
+<% use_page_title "Add a New Group" %>
+<%= render 'form' %>

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

@@ -1,3 +1,3 @@
-<%= f.cms_text_field :name %>
-<%= f.cms_text_editor :content %>
+<%= f.input :name %>
+<%= f.input :content, as: :text_editor %>
 <%= f.cms_tag_list %>

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

@@ -1 +1 @@
-<%= @content_block.content.html_safe %>
+<%= show :content %>

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

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

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

@@ -1,13 +1,8 @@
-<%= content_for :html_head, stylesheet_link_tag('cms/form_layout') %>
-<%= f.cms_error_messages %>
-
-<%= f.cms_text_field :name %>
-<%= f.cms_text_field :url %>
-
-<div class="checkbox_group fields no_check_all">
-  <div class="checkbox_fields">
-    <%= f.label :new_window, "Open In New Window?" %>
-    <%= f.check_box :new_window, :tabindex => next_tabindex %>
-  </div>
+<%= page_title_with_buttons f %>
+<div class="padded row-fluid clearfix">
+  <%= f.input :name %>
+  <%= f.input :url %>
+  <%= f.input :new_window, label: "Open In New Window?" %>
 </div>
+<%= bottom_buttons f %>
 

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

@@ -1,13 +1,4 @@
-<% page_title "Edit '#{h(@link.name)}' Link" %>
-<%= 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(@link) do |f| %>
-  <%= render :partial => 'form', :locals => {:f => f} %>
-  <div class="buttons">
-    <%= publish_button "link" %>
-    <%= lt_button_wrapper(f.submit("Save", :class => "submit")) %>
-  </div>
+<% use_page_title "Edit Link" %>
+<%= simple_form_for(@link) do |f| %>
+  <%= render :partial => 'form', :locals => {:f => f, title: 'Edit Link'} %>
 <% end %>

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

@@ -1,14 +1,5 @@
-<% @link_title = @page_title = "Add New Link to Sitemap" %>
-<%= 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(@link) do |f| %>
-  <%= hidden_field_tag :section_id, @link.section_id %>
-  <%= render :partial => 'form', :locals => {:f => f} %>
-  <div class="buttons">
-    <%= publish_button "link" %>
-    <%= lt_button_wrapper(f.submit("Save", :class => "submit", :tabindex => next_tabindex )) %>
-  </div>
+<% use_page_title "Add a New Link" %>
+<%= simple_form_for(@link) do |f| %>
+    <%= hidden_field_tag :section_id, @link.section_id %>
+    <%= render :partial => 'form', :locals => {:f => f, title: 'Add a New Link'} %>
 <% end %>

data/app/views/cms/page_components/_content.html.erb

@@ -0,0 +1,18 @@
+<dl>
+  <dt><%= link_to "Add #{@default_type.display_name}", new_engine_aware_path((@default_type),
+            "#{@default_type.param_key}[connect_to_page_id]" => params[:connect_to_page_id],
+            "#{@default_type.param_key}[connect_to_container]" => params[:connect_to_container]
+          ),
+
+                 :class=>"btn btn-small btn-primary" %></dt>
+  <dd>Or choose another content types to add:</p>
+  <ul>
+    <% @content_types.each_with_index do |type, i| %>
+    <li><%= link_to h(type.display_name), new_engine_aware_path(type,
+            "#{type.param_key}[connect_to_page_id]" => params[:connect_to_page_id],
+            "#{type.param_key}[connect_to_container]" => params[:connect_to_container]
+          ), :target=> "_top" %></li>
+    <% end %>
+  </ul></dd>
+</dl>
+

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

@@ -0,0 +1,12 @@
+<div class="modal-header">
+  <button type="button" class="close" data-dismiss="modal" aria-hidden="true">×</button>
+  <button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
+  <h3>Add Content</h3>
+</div>
+<div class="modal-body">
+  <%= render 'content' %>
+</div>
+<div class="modal-footer">
+  <%= link_to "Never Mind", "#", class: "btn btn-small", data: {dismiss: "modal", }, "aria-hidden" => "true" %>
+  <%= link_to "Reuse Content Instead?", cms.new_connector_path(:page_id => params[:connect_to_page_id], :container => params[:connect_to_container]) , class: "btn btn-small btn-primary", id: "insert_existing_content" %>
+</div>

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

@@ -1,11 +1,12 @@
-<%= content_for :html_head, stylesheet_link_tag('cms/form_layout') %>
-<%= form_for(@page_route) do |f| %>
-  <%= f.cms_error_messages %>
-  <%= f.cms_drop_down :page_id, Cms::Page.all(:order => "path").map{|p| ["#{p.path} (#{p.name})", p.id]}%>
-  <%= f.cms_text_field :name %>
-  <%= f.cms_text_field :pattern %>
-  <%= f.cms_text_area :code, :style => "height: 200px" %>
-  <div class="buttons">
-    <%= lt_button_wrapper(f.submit("Save", :class => "submit", :tabindex => next_tabindex)) %>
-  </div>
+<% content_for :buttons, 'save_buttons' %>
+<%= simple_form_for(@page_route) do |f| %>
+    <%= render layout: 'form_with_buttons', locals: {f: f} do %>
+        <%= f.association :page,
+                          collection: Cms::Page.order(:path),
+                          include_blank: false,
+                          label_method: lambda { |p| "#{p.path} (#{p.name})" } %>
+        <%= f.input :name %>
+        <%= f.input :pattern %>
+        <%= f.input :code, as: :text, input_html: {style: "height: 200px"} %>
+    <% end %>
 <% end %>