dm_core 4.2.1.5

data/app/views/dm_core/admin/custom_fields/_select.html.erb

@@ -0,0 +1,4 @@
+<% disabled ||= false %>
+<%= content_tag(:div, markdown(f.object.description), class: 'custom_field_description') unless f.object.description.blank? %>
+<%= f.input :field_data, as: :select, collection: f.object.choice_list_array, label: field.label.blank? ? false : field.label, required: field.required?, disabled: disabled %>
+<%= f.hidden_field(:custom_field_def_id) unless disabled %>

data/app/views/dm_core/admin/custom_fields/_text_area.html.erb

@@ -0,0 +1,4 @@
+<% disabled ||= false %>
+<%= content_tag(:div, markdown(f.object.description), class: 'custom_field_description') unless f.object.description.blank? %>
+<%= f.input :field_data, as: :text, label: field.label.blank? ? false : field.label, required: field.required?, disabled: disabled %>
+<%= f.hidden_field(:custom_field_def_id) unless disabled %>

data/app/views/dm_core/admin/custom_fields/_text_field.html.erb

@@ -0,0 +1,4 @@
+<% disabled ||= false %>
+<%= content_tag(:div, markdown(f.object.description), class: 'custom_field_description') unless f.object.description.blank? %>
+<%= f.input :field_data, label: field.label.blank? ? false : field.label, required: field.required?, disabled: disabled %>
+<%= f.hidden_field(:custom_field_def_id) unless disabled %>

data/app/views/dm_core/admin/dashboard/_index_sidebar.html.erb

@@ -0,0 +1,22 @@
+<% content_for :sidebar do %>
+
+  <!-- Text stats -->
+  <ul class="text-stats block">
+    <li><%= link_to "n/a<span>subscribers</span>".html_safe, '#' %></li>
+    <li><%= link_to "n/a<span>contributions</span>".html_safe, '#' %></li>
+    <li><%= link_to "#{User.current_account_users.count}<span>users</span>".html_safe, dm_core.admin_users_path %></li>
+  </ul>
+  <!-- /text stats -->
+
+  <!-- Sidebar stats -->
+  <%= render partial: 'dm_core/admin/dashboard/widget_sidebar_user_stats' %>
+
+  <ul class="topstats block">
+    <li>
+      <div class="left">Since launch:<h1>$15,859</h1></div>
+      <div class="topchart" id="balance">10,14,8,45,23,41,22,31,19,12, 28, 21, 24, 20</div>
+    </li>
+  </ul>
+  <!-- /sidebar stats -->
+  
+<% end %>

data/app/views/dm_core/admin/dashboard/_widget_recent_new_users.html.erb

@@ -0,0 +1,23 @@
+<%= panel title: 'Recent New Users', body: false do %>
+  <ul class="page-stats list-justified nomargin_bottom">
+    <li><%= render partial: 'dm_core/admin/shared/header_stats_new_users' %></li>
+  </ul>
+  <table class="table table-bordered table-condensed" style="border-top: 1px solid #d5d5d5;">
+    <thead>
+      <tr>
+        <th>Name</th>
+        <th>Registered On</th>
+        <th>Last Login</th>
+      </tr>
+    </thead>
+    <tbody>
+      <% User.current_account_users.order('user_site_profiles.created_at DESC').limit(5).each do |user| %>
+        <tr>
+          <td><%= user.full_name %></td>
+          <td align="center"><%= "#{time_ago_in_words(user.created_at)} ago" %></td>
+          <td align="center"><%= present(user).last_access %></td>
+        </tr>
+      <% end %>
+    </tbody>
+  </table>
+<% end %>

data/app/views/dm_core/admin/dashboard/_widget_recent_user_activity.html.erb

@@ -0,0 +1,21 @@
+<%= panel title: 'Recent User Activity', body: false do %>
+  <ul class="page-stats list-justified nomargin_bottom">
+    <li><%= render partial: 'dm_core/admin/shared/header_stats_user_activity' %></li>
+  </ul>
+  <table class="table table-bordered table-condensed" style="border-top: 1px solid #d5d5d5;">
+    <thead>
+      <tr>
+        <th>Name</th>
+        <th style="text-align: center">Last Login</th>
+      </tr>
+    </thead>
+    <tbody>
+      <% User.current_account_users.order('user_site_profiles.last_access_at DESC').limit(5).each do |user| %>
+        <tr>
+          <td><%= user.full_name %></td>
+          <td align="center"><%= present(user).last_access %></td>
+        </tr>
+      <% end %>
+    </tbody>
+  </table>
+<% end %>

data/app/views/dm_core/admin/dashboard/index.html.erb

@@ -0,0 +1,7 @@
+<%= render :partial => 'dm_core/admin/dashboard/index_sidebar' %>
+
+<div class="row-fluid">
+  <%= render partial: 'dm_core/admin/dashboard/widget_recent_new_users' %>
+
+  <%= render partial: 'dm_core/admin/dashboard/widget_recent_user_activity' %>
+</div>

data/app/views/dm_core/admin/dashboard/update_site_assets.html.erb

@@ -0,0 +1,5 @@
+<%= panel title: 'Results from Updating Assets' do %>
+<pre>
+<%= @results %>
+</pre>
+<% end %>

data/app/views/dm_core/admin/shared/_header_stats_new_users.html.erb

@@ -0,0 +1,2 @@
+<% new_users = UserSiteProfile.new_last_30_days %>
+<%= stat_with_graph title: 'New Users', number: new_users[:total], color_type: :danger, data_list: new_users[:list] %>

data/app/views/dm_core/admin/shared/_header_stats_user_activity.html.erb

@@ -0,0 +1,2 @@
+<% accessed_users = UserSiteProfile.access_last_30_days %>
+<%= stat_with_graph title: 'Active Users', number: accessed_users[:total], color_type: :info, data_list: accessed_users[:list] %>

data/app/views/dm_core/admin/system/show.html.erb

@@ -0,0 +1,23 @@
+<% toolbar = toolbar_btn(icons(:new), dm_core.admin_account_new_path, title: 'New Site', class: "btn btn-link btn-icon") %>
+<%= panel body: false, title: 'Account List', toolbar: toolbar do %>
+  <table class="table table-striped table-bordered table-block">
+    <thead>
+      <tr>
+        <th>Domain</th>
+        <th style="width: 50px;">Prefix</th>
+        <th style="width: 100px;">Status</th>
+      </tr>
+    </thead>
+    <tbody>
+      <% @accounts.each do |account| %>
+        <tr>
+          <td>
+            <%= link_to account.domain, dm_core.admin_account_general_path(id: account) %>
+          </td>
+          <td><%= account.account_prefix %></td>
+          <td><%= account.preferred_site_enabled? ? colored_label('Site Published', :success) : colored_label('Site Disabled') %></td>
+        </tr>
+      <% end %>
+    </tbody>
+  </table>
+<% end %>

data/app/views/dm_core/admin/users/_form.html.erb

@@ -0,0 +1,44 @@
+<% # if a manager is trying to edit an admin account %>
+<% disable_fields = @user.has_role?(:admin) && !is_admin? %>
+<%= simple_form_for(@user, :url => dm_core.admin_user_path,
+      html: { class: 'form-horizontal' }, wrapper: :bs3_horizontal_form, wrapper_mappings: DmAdmin::FormWrapperMappings) do |f| %>
+
+  <%= f.error_notification :message => "Please review the problems below" %>
+
+	<%= panel header: false do %>
+    
+    <%#= f.input :first_name %>
+    <%#= f.input :last_name %>
+    <%= f.input :email, disabled: disable_fields, hint: 'Note: If you change the email address, a confirmation email will be sent to the new address. The email 
+    address will look unchanged until it is confirmed' %>
+    <%= f.input(:unconfirmed_email, disabled: true, hint: 'The user needs to re-confirm this email address - an email has already been sent, or 
+           you can use the Confirm This User button') if @user.unconfirmed_email %>
+    <%#= f.input :country_id, :wrapper_html => { :class => 'searchDrop' }, :input_html => { :class => 'chosen_select' }, 
+                :collection => ut_country_select_collection, :label_method => lambda {|t| t[0]}, :value_method => lambda {|t| t[1]},
+                :label => "Country" %>
+    
+    <%= subsection title: 'Access Permissions' do %>
+      <p>Choose which permissions to grant to this user</p>
+      <% if disable_fields %>
+        <%= f.input 'roles[admin]', as: :boolean, label: 'Administrator', input_html: {checked: @user.has_role?(:admin)}, disabled: true, hint: 'access to entire website' %>
+      <% else %>
+        <%= f.input('roles[reviewer]',              as: :boolean, label: 'Reviewer', input_html: {checked: @user.has_role?(:reviewer)}, hint: 'will be able to view draft versions of blog entries, as long as they are sent the correct link') %>
+        <%= f.input('roles[content_manager]',       as: :boolean, label: 'Content Manager', input_html: {checked: @user.has_role?(:content_manager)}, hint: 'can manage blog and static pages') if defined?(DmCms) %>
+        <%= f.input('roles[event_manager]',         as: :boolean, label: 'Event Manager', input_html: {checked: @user.has_role?(:event_manager)}, hint: 'can manage events and workshops') if defined?(DmEvent) %>
+        <%= f.input('roles[forum_manager]',         as: :boolean, label: 'Forum Manager', input_html: {checked: @user.has_role?(:forum_manager)}, hint: 'can manage forums') if defined?(DmForum) %>
+        <%= f.input('roles[course_manager]',        as: :boolean, label: 'Course Manager', input_html: {checked: @user.has_role?(:course_manager)}, hint: 'can manage courses and lessons') if defined?(DmLms) %>
+        <%= f.input('roles[subscription_manager]',  as: :boolean, label: 'Subscription Manager', input_html: {checked: @user.has_role?(:course_manager)}, hint: 'can manage site subscriptions') if defined?(DmSubscriptions) %>
+        <%#= f.input 'roles[newsletter_manager]',    as: :boolean, label: 'Newsletter Manager', input_html: {checked: @user.has_role?(:newsletter_manager)}, hint: 'can manage newsletters' %>
+        <hr>
+        <%= f.input 'roles[manager]',         as: :boolean, label: 'Manager', input_html: {checked: @user.has_role?(:manager)}, hint: 'can manage all areas except for global account settings and deleting users' %>
+        <% if is_admin? %>
+          <%= f.input 'roles[admin]', as: :boolean, label: 'Administrator', input_html: {checked: @user.has_role?(:admin)}, hint: 'access to entire website' %>
+        <% end %>
+      <% end %>
+    <% end %>
+    
+    <%= submit_or_cancel :cancel_url => dm_core.admin_users_url %>
+
+  <% end %>
+
+<% end %>

data/app/views/dm_core/admin/users/edit.html.erb

@@ -0,0 +1,201 @@
+<% content_for :content_title, @user.email %>
+<% content_for :content_subtitle, @user.display_name %>
+<% disable_fields = @user.has_role?(:admin) && !is_admin? %>
+
+<div class="row">
+  <div class="col-md-9">
+    <div class="tabbable">
+      <ul class="nav nav-tabs">
+        <li class="active"><a href="#summary_tab" data-toggle="tab">Summary</a></li>
+        <li><a href="#profile_tab" data-toggle="tab">Profile</a></li>
+        <li><a href="#permissions_tab" data-toggle="tab">Permissions</a></li>
+      </ul>
+
+      <div class="tab-content with-padding">
+
+        <%#--- Summary Tab %>
+        <div class="tab-pane fade in active" id="summary_tab">
+          <div class="row">
+            <div class="col-md-12">
+              <%= subsection title: "Various Details for #{@user.display_name}" do %>
+                <% if defined?(DmEvent) %>
+                  <%= panel body: false, title: "Event Registrations" do %>
+                    <table class="table table-bordered table-condensed table-striped">
+                      <thead>
+                        <tr>
+                          <th class="name">Workshop Title</th>
+                          <th class="name">Domain</th>
+                        </tr>
+                      </thead>
+                      <tbody>
+                        <% reg = (is_sysadmin? ? Registration.unscoped : Registration.all) %>
+                        <% reg.where(user_profile_id: @user.user_profile).includes(:workshop => [:translations]).includes(:account).each do |registration| %>
+                          <tr>
+                            <td class="name"><%= registration.workshop ? registration.workshop.title : 'oops' %></td>
+                            <td class="name"><%= registration.account.domain %></td>
+                          </tr>
+                        <% end %>
+                      </tbody>
+                    </table>
+                  <% end %>
+                <% end %>
+
+                <% if defined?(DmSubscriptions) %>
+                  <%= panel title: "Subscriptions" do %>
+                    <%= subsection title: 'Subscriptions' do %>
+                      <table class="table table-bordered table-condensed table-striped">
+                        <thead>
+                          <tr>
+                            <th class="name">Subscriptions</th>
+                            <th class="name">Domain</th>
+                          </tr>
+                        </thead>
+                        <tbody>
+                          <% sub = (is_sysadmin? ? Subscription.unscoped : Subscription.all) %>
+                          <% sub.where(subscriber_id: @user, subscriber_type: 'User').each do |subscription| -%>
+                            <tr>
+                              <td class="name"><%= subscription.subscription_plan.name %></td>
+                              <td class="name"><%= subscription.account.domain %></td>
+                            </tr>
+                          <% end %>
+                        </tbody>
+                      </table>
+                    <% end %>
+
+                    <%= subsection title: 'Payments' do %>
+                      <table class="table table-bordered table-condensed table-striped">
+                        <thead>
+                          <tr>
+                            <th class="name">Payments</th>
+                            <th class="name">Domain</th>
+                          </tr>
+                        </thead>
+                        <tbody>
+                          <% pay = (is_sysadmin? ? SubscriptionPayment.unscoped : SubscriptionPayment.all) %>
+                          <% pay.unscoped.where(subscriber_id: @user, subscriber_type: 'User').each do |payment| -%>
+                            <tr>
+                              <td class="name"><%= format_date(payment.created_at) %></td>
+                              <td class="name"><%= payment.amount.format %></td>
+                            </tr>
+                          <% end %>
+                        </tbody>
+                      </table>
+                    <% end %>
+                  <% end %>
+                <% end %>
+
+                <% if defined?(DmCms) && current_user.is_sysadmin? %>
+                  <%= panel body: false, title: "Comments (system admin only)" do %>
+                    <table class="table table-bordered table-condensed table-striped">
+                      <thead>
+                        <tr>
+                          <th class="date">Date</th>
+                          <th class="name">Domain</th>
+                          <th class="name">type</th>
+                          <th>Text</th>
+                        </tr>
+                      </thead>
+                      <tbody>
+                        <% Comment.unscoped.where(user_id: @user).includes(:account).each do |comment| -%>
+                          <tr>
+                            <td class="date"><%= format_date comment.created_at %></td>
+                            <td class="name"><%= comment.account.domain %></td>
+                            <td class="name"><%= comment.commentable_type %></td>
+                            <td class="name"><%= comment.body %></td>
+                          </tr>
+                        <% end %>
+                      </tbody>
+                    </table>
+                  <% end %>
+                <% end %>
+
+              <% end %>
+            </div>
+          </div>
+        </div>
+
+        <%#--- Profile Tab %>
+        <div class="tab-pane fade in" id="profile_tab">
+          <div class="row">
+            <div class="col-md-12">
+              <%= subsection title: "Profile for #{@user.display_name}" do %>
+                <%= simple_form_for(@user, :url => dm_core.admin_user_path,
+                      html: { class: 'form-horizontal' }, wrapper: :bs3_horizontal_form, wrapper_mappings: DmAdmin::FormWrapperMappings) do |f| %>
+
+                  <%= f.error_notification :message => "Please review the problems below" %>
+                  <%#= f.input :first_name %>
+                  <%#= f.input :last_name %>
+                  <%= f.input :email, disabled: disable_fields, hint: 'Note: If you change the email address, a confirmation email will be sent to the new address. The email 
+                  address will look unchanged until it is confirmed' %>
+                  <%= f.input(:unconfirmed_email, disabled: true, hint: 'The user needs to re-confirm this email address - an email has already been sent, or 
+                         you can use the Confirm This User button') if @user.unconfirmed_email %>
+                  <%#= f.input :country_id, :wrapper_html => { :class => 'searchDrop' }, :input_html => { :class => 'chosen_select' }, 
+                              :collection => ut_country_select_collection, :label_method => lambda {|t| t[0]}, :value_method => lambda {|t| t[1]},
+                              :label => "Country" %>
+      
+                  <%= submit_or_cancel :cancel_url => dm_core.admin_users_url %>
+                <% end %>
+              <% end %>
+            </div>
+          </div>
+        </div>
+
+        <%#--- Permissions Tab %>
+        <div class="tab-pane fade" id="permissions_tab">
+          <div class="row">
+            <div class="col-md-12">
+              <%= subsection title: "Access Permissions for #{@user.display_name}" do %>
+                <p>Choose which permissions to grant to this user</p>
+                <%= simple_form_for(@user, :url => dm_core.admin_user_path,
+                    html: { class: 'form-horizontal' }, wrapper: :bs3_horizontal_form, wrapper_mappings: DmAdmin::FormWrapperMappings) do |f| %>
+
+                  <%= f.error_notification :message => "Please review the problems below" %>
+
+                  <% if disable_fields %>
+                    <%= f.input 'roles[admin]', as: :boolean, label: 'Administrator', input_html: {checked: @user.has_role?(:admin)}, disabled: true, hint: 'access to entire website' %>
+                  <% else %>
+                    <%= f.input('roles[reviewer]',              as: :boolean, label: 'Reviewer', input_html: {checked: @user.has_role?(:reviewer)}, hint: 'will be able to view draft versions of blog entries, as long as they are sent the correct link') %>
+                    <%= f.input('roles[content_manager]',       as: :boolean, label: 'Content Manager', input_html: {checked: @user.has_role?(:content_manager)}, hint: 'can manage blog and static pages') if defined?(DmCms) %>
+                    <%= f.input('roles[event_manager]',         as: :boolean, label: 'Event Manager', input_html: {checked: @user.has_role?(:event_manager)}, hint: 'can manage events and workshops') if defined?(DmEvent) %>
+                    <%= f.input('roles[forum_manager]',         as: :boolean, label: 'Forum Manager', input_html: {checked: @user.has_role?(:forum_manager)}, hint: 'can manage forums') if defined?(DmForum) %>
+                    <%= f.input('roles[course_manager]',        as: :boolean, label: 'Course Manager', input_html: {checked: @user.has_role?(:course_manager)}, hint: 'can manage courses and lessons') if defined?(DmLms) %>
+                    <%= f.input('roles[subscription_manager]',  as: :boolean, label: 'Subscription Manager', input_html: {checked: @user.has_role?(:course_manager)}, hint: 'can manage site subscriptions') if defined?(DmSubscriptions) %>
+                    <%#= f.input 'roles[newsletter_manager]',    as: :boolean, label: 'Newsletter Manager', input_html: {checked: @user.has_role?(:newsletter_manager)}, hint: 'can manage newsletters' %>
+                    <hr>
+                    <%= f.input 'roles[manager]',         as: :boolean, label: 'Manager', input_html: {checked: @user.has_role?(:manager)}, hint: 'can manage all areas except for global account settings and deleting users' %>
+                    <% if is_admin? %>
+                      <%= f.input 'roles[admin]', as: :boolean, label: 'Administrator', input_html: {checked: @user.has_role?(:admin)}, hint: 'access to entire website' %>
+                    <% end %>
+                    <%= submit_or_cancel :cancel_url => dm_core.admin_users_url %>
+                  <% end %>
+                <% end %>
+              <% end %>
+            </div>
+          </div>
+        </div>
+
+      </div>
+    </div>
+
+  </div>
+  <div class="col-md-3">
+    <p class="avatar"><%= avatar_for @user, 200 %></p>
+    <%= subsection title: @user.display_name do %>
+      <dl>
+        <dt class="text-info">Last Accessed On</dt>
+        <dd><%= format_datetime(@user.last_access_at) %></dd>
+        <dt class="text-info">Confirmed On</dt>
+        <dd><%= format_datetime(@user.confirmed_at) %></dd>
+        <dt class="text-info">Created On</dt>
+        <dd><%= format_datetime(@user.created_at) %></dd>
+      </dl>
+    <% end %>
+    <% if !@user.confirmed? %>
+      <%= link_to "Confirm This User", dm_core.confirm_admin_user_path(@user.id), :class => "btn btn-block btn-success" %>
+    <% elsif is_admin? || !@user.has_role?(:admin) %>
+      <%= link_to "Become This User", dm_core.masquerade_admin_user_path(@user.id), :class => "btn btn-block btn-info" %>
+    <% end %>
+    <%= link_to("Delete This User", dm_core.admin_user_path(@user, :locale => DmCore::Language.locale), method: :delete, data: { confirm: 'Are you sure?' }, :title => 'Remove', :class => "btn btn-block btn-danger") if is_sysadmin? %>
+
+  </div>
+</div>

data/app/views/dm_core/admin/users/index.html.erb

@@ -0,0 +1,30 @@
+<% content_for :content_title_extra do %>
+  <div class="header-bar-stats">
+    <div class="collapse" id="header-bar-stats">
+      <div class="well">
+        <ul class="page-stats">
+          <li><%= render partial: 'dm_core/admin/shared/header_stats_new_users' %></li>
+          <li><%= render partial: 'dm_core/admin/shared/header_stats_user_activity' %></li>
+        </ul>
+      </div>
+    </div>
+  </div>
+<% end %>
+<%= panel title: 'Users', body: false do %>
+  <div class="datatable">
+    <table id="user_table" class="table table-striped table-condensed table-bordered" data-source="<%= dm_core.admin_users_url %>">
+      <thead>
+        <tr>
+          <th width="40"></th>
+          <th>Name</th>
+          <th>Email</th>
+          <th>Country</th>
+          <th>Last Access</th>
+          <th>Role</th>
+        </tr>
+      </thead>
+      <tbody>
+      </tbody>
+    </table>
+  </div>
+<% end %>

data/app/views/dm_core/profile/_profile_sidebar.html.erb

@@ -0,0 +1,6 @@
+<nav>
+  <ul id="profile_menu_list">
+    <li><%= link_to I18n.t('core.profile_account_settings'), dm_core.edit_profile_account_path %></li>
+    <li><%= link_to I18n.t('core.profile_details_settings'), dm_core.edit_profile_details_path %></li>
+  </ul>
+</nav>

data/app/views/dm_core/profile/account.html.erb

@@ -0,0 +1,38 @@
+<% content_for :sidebar do %>
+  <%= render :partial => 'dm_core/profile/profile_sidebar' %>
+<% end %>
+
+<%= simple_form_for(@user, :url => dm_core.edit_profile_account_path, wrapper: simple_form_theme_wrapper, html: {id: 'profile_form', class: 'profile_account_form'}) do |f| %>
+  <%= flash_notices %>
+  <%= f.error_notification :message => I18n.t('core.errors_below') %>
+
+  <fieldset>
+    <h2><%= I18n.t 'core.profile_account_title' %></h2>
+    <p><%= I18n.t 'core.profile_account_explanation' %></p>
+    <% if !@user.unconfirmed_email.blank? && flash[:notice].blank? %>
+      <div class="alert alert-error">
+        <p><%= I18n.t 'core.profile_email_needs_confirmation' %><br />
+          <strong>&nbsp;&nbsp;&nbsp;<%= @user.unconfirmed_email %></strong><br />
+          <%= I18n.t 'core.profile_email_needs_confirmation_2' %>
+        </p>
+      </div>
+    <% end %>
+    <%= f.input :email, :label => I18n.t('core.profile_email'), :required => true %>
+  </fieldset>
+  
+  <fieldset>
+    <h2><%= I18n.t 'core.profile_account_password_title' %></h2>
+    <%= f.input :password, label: I18n.t('core.profile_password') %>
+    <%= f.input :password_confirmation, label: I18n.t('core.profile_password_confirmation') %>
+  </fieldset>
+
+  <fieldset>
+    <h2><%= I18n.t 'core.profile_account_password_current_title' %></h2>
+    <p><%= I18n.t 'core.profile_account_password_current_explanation' %></p>
+    <%= f.input :current_password, label: I18n.t('core.profile_current_password'), :required => true %>
+  </fieldset>
+
+  <fieldset class="submit_form">
+    <%= f.button :submit, I18n.t('core.profile_update_btn') %>
+  </fieldset>
+<% end %>