browsercms 3.5.7 → 4.0.0.alpha

data/app/views/cms/toolbar/_new_pages_menu.html.erb

@@ -0,0 +1,10 @@
+<%
+   # Allows Sitemap menu to have 'New Page' while New menu has no prefix.
+    unless defined?(prefix)
+        prefix = ""
+    end
+%>
+<%= nav_link_to "#{prefix}Page", cms.new_section_page_path(target_section), class: 'add-page-button' %>
+<%= nav_link_to "#{prefix}Link", cms.new_section_link_path(target_section), class: 'add-section-button' %>
+<%= nav_link_to "#{prefix}Section", cms.new_section_path(:section_id => target_section.id), class: 'add-link-button' %>
+<%= divider_tag %>

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

@@ -1,12 +1,9 @@
-<%= content_for :html_head do %>
-  <%= stylesheet_link_tag('cms/form_layout') %>
-<% end %>
-<%= form_for(@user) do |f| %>
-  <%= f.cms_error_messages %>
-  <%= render :partial => 'user_fields', :locals => {:f => f} unless @change_password %>
-  <%= render :partial => 'password', :locals => {:f => f} if @user.new_record? %>
-  <%= render :partial => 'groups' %>
-  <div class="buttons">
-    <%= lt_button_wrapper(f.submit("Save", :class => "submit")) %>
-  </div>
+<%= simple_form_for(@user.becomes(Cms::User), html: {autocomplete: 'off'}) do |f| %>
+    <%=  page_title_with_buttons(f, 'save_buttons') %>
+    <%= render layout: 'main_with_sidebar' do %>
+        <%= render :partial => 'user_fields', :locals => {:f => f} unless @change_password %>
+        <%= render :partial => 'password', :locals => {:f => f} if @user.new_record? %>
+        <%= f.association :groups, as: :check_boxes %>
+    <% end %>
+    <%= bottom_buttons(f, 'save_buttons') %>
 <% end %>

data/app/views/cms/users/_password.html.erb

@@ -1,8 +1,2 @@
-<div class="fields text_fields">
-    <%= f.label :password %>
-    <%= f.password_field :password, :autocomplete => "off" %>
-</div>
-<div class="fields text_fields">
-    <%= f.label :password_confirmation, "Confirm Password" %>
-    <%= f.password_field :password_confirmation, :autocomplete => "off" %>
-</div>
+<%= f.input :password, required: true %>
+<%= f.input :password_confirmation, label: "Confirm Password", required: true %>

data/app/views/cms/users/_user_fields.html.erb

@@ -1,20 +1,7 @@
-<div class="fields text_fields">
-    <%= f.label :login, "Username" %>
-    <%= f.text_field :login, :autocomplete => "off" %>
-</div>
-<div class="fields text_fields">
-    <%= f.label :email %>
-    <%= f.text_field :email, :autocomplete => "off" %>
-</div>
-<div class="fields text_fields">
-    <%= f.label :first_name, "First Name" %>
-    <%= f.text_field :first_name, :autocomplete => "off" %>
-</div>
-<div class="fields text_fields">
-    <%= f.label :last_name, "Last Name" %>
-    <%= f.text_field :last_name, :autocomplete => "off" %>
-</div>
-<div class="fields text_fields">
-    <%= f.label :expires_at, "Expiration Date" %>
-    <%= f.date_picker :expires_at, :autocomplete => "off" %>
-</div>
+<%= f.input :login, label: 'Username' %>
+<%= f.input :email, required: true %>
+<%= f.input :first_name, label: 'First Name' %>
+<%= f.input :last_name, label: 'Last Name' %>
+<%= f.input :expires_at, label: 'Expiration Date', as: :date_picker %>
+
+

data/app/views/cms/users/change_password.html.erb

@@ -1,21 +1,12 @@
-<% @page_title = @toolbar_title = "Set New Password" %>
-<%= able_to? :administrate do %>
-  <%= content_for :toolbar_links do %>
-    <%= link_to(span_tag("List All"), users_path, :id => "list_all_button", :class => "button") %>
-    <%= link_to(span_tag("Edit User"), edit_user_path(@user), :id => "edit_user_button", :class => "button") %>
-  <% end %>
-
-  <%= content_for :functions, render(:partial => "toolbar") %>
-<% end %>
-
-<%= content_for :html_head do %>
-  <%= stylesheet_link_tag('cms/form_layout') %>
-<% end %>
-
-<%= form_for([:update_password, @user]) do |f| %>
-  <%= f.cms_error_messages %>
-  <%= render :partial => 'password', :locals => {:f => f} %>
-  <div class="buttons">
-    <%= lt_button_wrapper(f.submit("Save", :class => "submit")) %>
-  </div>
-<% end %>
+<% use_page_title "Set New Password" %>
+<% content_for :buttons, 'save_buttons' %>
+<%= simple_form_for([:update_password, @user], html: {autocomplete: 'off'}) do |f| %>
+    <%= render layout: 'form_with_buttons', locals: {f: f} do %>
+        <%= render 'password', f: f %>
+        <%= content_for :sidebar do %>
+            <div class="sidebar-block">
+              <h4 class="gray">For user: <span class="dark"><%= @user.login %></span></h4>
+            </div>
+        <% end %>
+    <% end %>
+<% end %>

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

@@ -1,16 +1,2 @@
-<% @page_title = @toolbar_title = "Edit User '#{h(@user.login)}'" %>
-
-<%= content_for :toolbar_links do %>
-  <%= link_to(span_tag("List All"), users_path,
-    :id => "list_all_button", 
-    :class => "button") %>
-  <%= link_to(span_tag("Change Password"), [:change_password, @user], 
-    :id => "change_password_button", 
-    :class => "button") %>
-<% end %>
-
-<%= content_for :functions do %>
-  <%= render(:partial => "toolbar") %>
-<% end %>
-
+<% use_page_title "Edit User" %>
 <%= render :partial => 'form' %>

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

@@ -1,62 +1,65 @@
-<% page_title "Administration / User Browser" %>
-<% @toolbar_title = "List Users" %>
-
-<%= content_for :toolbar_links do %>
-  <%= link_to(span_tag("ADD USER"), new_user_path,
-    :id => "add_user_button", 
-    :class => "button") %>
-<% end %>
-
-<%= content_for :functions do %>
-  <%= render(:partial => "toolbar") %>
+<% use_page_title "Users" %>
+<%= render layout: 'page_title', locals: {span: 'span3'} do %>
+    <%= link_to "Add User", new_user_path, :id => "add_user_button", :class => "btn btn-small btn-primary right" %>
 <% end %>
+<div class="row-fluid padded">
+    <%= form_tag(users_path, :method => :get, class: 'form-search right') do %>
+            <%= group_filter %>
+            <%= text_field_tag "key_word", params[:key_word], placeholder: "Search Users...", class: 'search-query' %>
+            <label class="boolean optional control-label checkbox" for="show_expired">
+                      <%= check_box_tag "show_expired", "yes", params[:show_expired] %>
+                      Show inactive?</label>
 
-<div class="roundedcorners">
-<table class="data" width="100%">
-  <thead>
-    <tr>
-      <th class="first"></th>
-      <th><div class="dividers">Name</div></th>
-      <th><div class="dividers">Email</div></th>
-      <th><div class="dividers">Groups</div></th>
-      <th><div class="dividers">Expiration</div></th>
-      <th class="last" colspan="2">Activation</th>
-    </tr>
-  </thead>
-    <% @users.each do |user|%>
-    <tr>
-        <td class="first"></td>
-        <td><div class="dividers"><%= link_to "#{user.full_name_or_login}", edit_user_path(user) %></div></td>
-	      <td><div class="dividers"><%= link_to user.email, "mailto:#{user.email}" %></div></td>
-        <td>
-            <div class="dividers">
-            <% user.groups.all(:order => "#{Cms::Group.table_name}.name").each do |g| %>
-	            <%= g.name %><br/>
-	          <% end %>
-	          </div>
-        </td>
-	      <td><div class="dividers"><%= user.expires_at ? format_date(user.expires_at) : "Never" %></div></td>
-        <td>
-	  <% unless user.expired? %>
-	  <span class="user_state">Active</span>
-            <%= link_to("<span>Disable</span>".html_safe, [:disable, user], :class => "http_put sm_button") if @users.size > 1 %>
-	    <% else %>
-	  <span class="user_state">Inactive</span>
-            <%= link_to("<span>Enable</span>".html_safe, [:enable, user], :class => "http_put sm_button") %>
-	  <% end %>
-        </td>
-        <td class="last"></td>
-    </tr>
-    <% end %>
-</table>
-<div class="tl"></div>
-<div class="tr"></div>
-<div class="bl"></div>
-<div class="br"></div>
+            <%= submit_tag "Search", id: 'user_search_submit', class: 'hide' %>
+        <% end %>
 </div>
-<% if @users.size == 0 && params[:key_word]%>
-  <div class="pagination">No results found for '<%= params[:key_word] %>'</div>
-<% elsif @users.total_pages > 1 %>
-  <%= render_pagination @users, Cms::User %>
+<%= render layout: 'main_content' do %>
+    <table class="data table table-bordered table-rounded table-hover table-striped" width="100%">
+      <thead>
+      <tr>
+        <th>Name</th>
+        <th>Email</th>
+        <th>Groups</th>
+        <th>Expiration</th>
+        <th>Actions</th>
+        <% if @have_external_users %>
+            <th>Source</th>
+        <% end %>
+      </tr>
+      </thead>
+      <% @users.each do |user| %>
+          <tr>
+            <td>
+              <%= link_to "#{user.full_name_or_login}", edit_user_path(user) %>
+            </td>
+            <td>
+              <%= link_to user.email, "mailto:#{user.email}" %>
+            </td>
+            <td>
+              <% user.groups.order("#{Cms::Group.table_name}.name").each do |g| %>
+                  <%= g.name %>
+              <% end %>
+            </td>
+            <td>
+              <%= user.expires_at ? format_date(user.expires_at) : "Never" %>
+            </td>
+            <td>
+              <%= link_to("Change Password", [:change_password, user.becomes(Cms::User)], :id => "change_password_button", :class => "btn btn-primary btn-mini") if user.password_changeable? %>
+              <% if user.expired? %>
+                  <%= link_to("Enable", [:enable, user.becomes(Cms::User)], :class => "http_put btn btn-mini btn-success") %>
+              <% else %>
+                  <%= link_to("Disable", [:disable, user.becomes(Cms::User)], :class => "http_put btn btn-mini btn-danger") if @users.size > 1 %>
+              <% end %>
+            </td>
+            <% if @have_external_users %>
+                <td><%= user.source %></td>
+            <% end %>
+          </tr>
+      <% end %>
+    </table>
+    <% if @users.size == 0 && params[:key_word] %>
+        <div class="pagination">No results found for '<%= params[:key_word] %>'</div>
+    <% elsif @users.total_pages > 1 %>
+        <%= render_pagination @users, Cms::User %>
+    <% end %>
 <% end %>
-

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

@@ -1,13 +1,2 @@
-<% @page_title = @toolbar_title = "New User" %>
-
-<%= content_for :toolbar_links do %>
-  <%= link_to(span_tag("List All"), users_path,
-    :id => "list_all_button", 
-    :class => "button") %>
-<% end %>
-
-<%= content_for :functions do %>
-  <%= render(:partial => "toolbar") %>
-<% end %>
-
+<% use_page_title "New User" %>
 <%= render :partial => 'form' %>

data/app/views/devise/confirmations/new.html.erb

@@ -0,0 +1,16 @@
+<h2>Resend confirmation instructions</h2>
+
+<%= simple_form_for(resource, :as => resource_name, :url => confirmation_path(resource_name), :html => { :method => :post }) do |f| %>
+  <%= f.error_notification %>
+  <%= f.full_error :confirmation_token %>
+
+  <div class="form-inputs">
+    <%= f.input :email, :required => true, :autofocus => true %>
+  </div>
+
+  <div class="form-actions">
+    <%= f.button :submit, "Resend confirmation instructions" %>
+  </div>
+<% end %>
+
+<%= render "devise/shared/links" %>

data/app/views/devise/mailer/confirmation_instructions.html.erb

@@ -0,0 +1,5 @@
+<p>Welcome <%= @email %>!</p>
+
+<p>You can confirm your account email through the link below:</p>
+
+<p><%= link_to 'Confirm my account', confirmation_url(@resource, :confirmation_token => @token) %></p>

data/app/views/devise/mailer/reset_password_instructions.html.erb

@@ -0,0 +1,8 @@
+<p>Hello <%= @resource.email %>!</p>
+
+<p>Someone has requested a link to change your password. You can do this through the link below.</p>
+
+<p><%= link_to 'Change my password', edit_password_url(@resource, :reset_password_token => @token) %></p>
+
+<p>If you didn't request this, please ignore this email.</p>
+<p>Your password won't change until you access the link above and create a new one.</p>

data/app/views/devise/mailer/unlock_instructions.html.erb

@@ -0,0 +1,7 @@
+<p>Hello <%= @resource.email %>!</p>
+
+<p>Your account has been locked due to an excessive number of unsuccessful sign in attempts.</p>
+
+<p>Click the link below to unlock your account:</p>
+
+<p><%= link_to 'Unlock my account', unlock_url(@resource, :unlock_token => @token) %></p>

data/app/views/devise/passwords/edit.html.erb

@@ -0,0 +1,19 @@
+<h2>Change your password</h2>
+
+<%= simple_form_for(resource, :as => resource_name, :url => password_path(resource_name), :html => { :method => :put }) do |f| %>
+  <%= f.error_notification %>
+
+  <%= f.input :reset_password_token, :as => :hidden %>
+  <%= f.full_error :reset_password_token %>
+
+  <div class="form-inputs">
+    <%= f.input :password, :label => "New password", :required => true, :autofocus => true %>
+    <%= f.input :password_confirmation, :label => "Confirm your new password", :required => true %>
+  </div>
+
+  <div class="form-actions">
+    <%= f.button :submit, "Change my password" %>
+  </div>
+<% end %>
+
+<%= render "devise/shared/links" %>

data/app/views/devise/passwords/new.html.erb

@@ -0,0 +1,15 @@
+<h2>Forgot your password?</h2>
+
+<%= simple_form_for(resource, :as => resource_name, :url => password_path(resource_name), :html => { :method => :post }) do |f| %>
+  <%= f.error_notification %>
+
+  <div class="form-inputs">
+    <%= f.input :email, :required => true, :autofocus => true %>
+  </div>
+
+  <div class="form-actions">
+    <%= f.button :submit, "Send me reset password instructions" %>
+  </div>
+<% end %>
+
+<%= render "devise/shared/links" %>

data/app/views/devise/registrations/edit.html.erb

@@ -0,0 +1,28 @@
+<h2>Edit <%= resource_name.to_s.humanize %></h2>
+
+<%= simple_form_for(resource, :as => resource_name, :url => registration_path(resource_name), :html => { :method => :put }) do |f| %>
+  <%= f.error_notification %>
+
+  <div class="form-inputs">
+    <%= f.input :login, :required => true, :autofocus => true %>
+    <%= f.input :email, :required => true %>
+
+    <% if devise_mapping.confirmable? && resource.pending_reconfirmation? %>
+      <p>Currently waiting confirmation for: <%= resource.unconfirmed_email %></p>
+    <% end %>
+
+    <%= f.input :password, :autocomplete => "off", :hint => "leave it blank if you don't want to change it", :required => false %>
+    <%= f.input :password_confirmation, :required => false %>
+    <%= f.input :current_password, :hint => "we need your current password to confirm your changes", :required => true %>
+  </div>
+
+  <div class="form-actions">
+    <%= f.button :submit, "Update" %>
+  </div>
+<% end %>
+
+<h3>Cancel my account</h3>
+
+<p>Unhappy? <%= link_to "Cancel my account", registration_path(resource_name), :data => { :confirm => "Are you sure?" }, :method => :delete %></p>
+
+<%= link_to "Back", :back %>

data/app/views/devise/registrations/new.html.erb

@@ -0,0 +1,18 @@
+<h2>Sign up</h2>
+
+<%= simple_form_for(resource, :as => resource_name, :url => registration_path(resource_name)) do |f| %>
+  <%= f.error_notification %>
+
+  <div class="form-inputs">
+    <%= f.input :login, :required => true, :autofocus => true %>
+    <%= f.input :email, :required => true %>
+    <%= f.input :password, :required => true %>
+    <%= f.input :password_confirmation, :required => true %>
+  </div>
+
+  <div class="form-actions">
+    <%= f.button :submit, "Sign up" %>
+  </div>
+<% end %>
+
+<%= render "devise/shared/links" %>

data/app/views/devise/shared/_links.erb

@@ -0,0 +1,25 @@
+<%- if controller_name != 'sessions' %>
+  <%= link_to "Sign in", new_session_path(resource_name) %><br />
+<% end -%>
+
+<%- if devise_mapping.registerable? && controller_name != 'registrations' %>
+  <%= link_to "Sign up", new_registration_path(resource_name) %><br />
+<% end -%>
+
+<%- if devise_mapping.recoverable? && controller_name != 'passwords' && controller_name != 'registrations' %>
+  <%= link_to "Forgot your password?", new_password_path(resource_name) %><br />
+<% end -%>
+
+<%- if devise_mapping.confirmable? && controller_name != 'confirmations' %>
+  <%= link_to "Didn't receive confirmation instructions?", new_confirmation_path(resource_name) %><br />
+<% end -%>
+
+<%- if devise_mapping.lockable? && resource_class.unlock_strategy_enabled?(:email) && controller_name != 'unlocks' %>
+  <%= link_to "Didn't receive unlock instructions?", new_unlock_path(resource_name) %><br />
+<% end -%>
+
+<%- if devise_mapping.omniauthable? %>
+  <%- resource_class.omniauth_providers.each do |provider| %>
+    <%= link_to "Sign in with #{provider.to_s.titleize}", omniauth_authorize_path(resource_name, provider) %><br />
+  <% end -%>
+<% end -%>

data/app/views/devise/unlocks/new.html.erb

@@ -0,0 +1,16 @@
+<h2>Resend unlock instructions</h2>
+
+<%= simple_form_for(resource, :as => resource_name, :url => unlock_path(resource_name), :html => { :method => :post }) do |f| %>
+  <%= f.error_notification %>
+  <%= f.full_error :unlock_token %>
+
+  <div class="form-inputs">
+    <%= f.input :email, :required => true, :autofocus => true %>
+  </div>
+
+  <div class="form-actions">
+    <%= f.button :submit, "Resend unlock instructions" %>
+  </div>
+<% end %>
+
+<%= render "devise/shared/links" %>

data/app/views/layouts/cms/_content_types.html.erb

@@ -0,0 +1,13 @@
+<ul class="dropdown-menu" id="<%= id %>">
+  <% if library %>
+    <%= nav_link_to "Text", cms.content_library_path %>
+    <%= divider_tag %>
+  <% end %>
+  <% modules = Cms::ContentType.available_by_module
+     modules.keys.sort.each_with_index do |module_name, i| %>
+      <%= divider_tag(i) %>
+      <% modules[module_name].each do |type| %>
+          <%= nav_link_to h(type.display_name), engine_aware_path(type) %>
+      <% end -%>
+  <% end %>
+</ul>