typus 3.1.0.rc18 → 3.1.0.rc19

data/app/helpers/admin/resources/list_helper.rb

@@ -1,14 +1,18 @@
 module Admin::Resources::ListHelper
 
   def list_actions
-    resources_actions.map do |body, url, options|
-      if admin_user.can?(url[:action], @resource.name)
-        path = params.dup.merge!(url).compact.cleanup
-        link_to Typus::I18n.t(body), path, options
-      end
+    resources_actions_for_current_role.map do |body, url, options|
+      path = params.dup.merge!(url).compact.cleanup
+      link_to Typus::I18n.t(body), path, options
     end.compact.join(" / ").html_safe
   end
 
+  def resources_actions_for_current_role
+    resources_actions.reject do |body, url, options|
+      admin_user.cannot?(url[:action], @resource.name)
+    end
+  end
+
   def build_actions(&block)
     render "helpers/admin/resources/actions", :block => block
   end
@@ -24,4 +28,8 @@ module Admin::Resources::ListHelper
     build_table(model, fields, items, link_options, association, association_name)
   end
 
+  def scopes
+    @resource.typus_defaults_for(:scopes).reject { |s| !@resource.respond_to?(s) }
+  end
+
 end

data/app/helpers/admin/resources/relationships_helper.rb

@@ -24,27 +24,6 @@ module Admin::Resources::RelationshipsHelper
                @association_name)
   end
 
-  def build_add_new(options = {})
-    default_options = { :controller => "/admin/#{@model_to_relate.to_resource}",
-                        :action => "index",
-                        :resource => @resource.model_name,
-                        :layout => 'admin/headless',
-                        :resource_id => @item.id,
-                        :resource_action => 'relate',
-                        :return_to => request.path }
-
-    # Add new basically means: We can create new items or relate existing ones.
-    create_or_read = admin_user.can?("create", @model_to_relate) || admin_user.can?("read", @model_to_relate)
-
-    if set_condition && create_or_read
-      link_to Typus::I18n.t("Add New"), default_options.merge(options), { :class => "iframe" }
-    end
-  end
-
-  def set_condition
-    (@resource.typus_user_id? && admin_user.is_not_root?) ? admin_user.owns?(@item) : true
-  end
-
   def set_conditions
     if @model_to_relate.typus_options_for(:only_user_items) && admin_user.is_not_root?
       { Typus.user_foreign_key => admin_user }

data/app/helpers/admin/resources_helper.rb

@@ -17,12 +17,12 @@ module Admin::ResourcesHelper
 
     admin_user.application(app_name).each do |resource|
       klass = resource.constantize
-      if (new_link = sidebar_add_new(klass))
-        resources[resource] = [new_link]
+      if klass.typus_options_for(:hide_from_sidebar) == false
+        resources[resource] = [sidebar_add_new(klass)].compact
       end
     end
 
-    render "helpers/admin/resources/sidebar", :resources => resources
+    render "helpers/admin/resources/sidebar", :resources => resources if resources.any?
   end
 
   def sidebar_add_new(klass)

data/app/mailers/admin/mailer.rb

@@ -2,11 +2,16 @@ class Admin::Mailer < ActionMailer::Base
 
   default :from => Typus.mailer_sender
 
-  def reset_password_link(user, url)
-    @user, @url = user, url
+  def reset_password_instructions(user)
+    @user = user
 
-    mail :to => user.email,
-         :subject => "[#{Typus.admin_title}] #{Typus::I18n.t("Reset password")}"
+    options = { :to => user.email,
+                :subject => "[#{Typus.admin_title}] #{Typus::I18n.t("Reset password")}" }
+
+    mail(options) do |format|
+      format.text
+      format.html
+    end
   end
 
 end

data/app/views/admin/base/user_guide.html.erb

@@ -1,6 +1,6 @@
 <%
   rails = "http://rubyonrails.org/"
-  typus = "http://core.typuscms.com/"
+  typus = "http://core.typuscmf.com/"
 %>
 
 <% content_for :main_grid do %>

data/app/views/admin/dashboard/widgets/_applications.html.erb

@@ -1,24 +1,46 @@
 <!-- Applications list with models. -->
 
-<h2><%= Typus::I18n.t("Applications") %></h2>
+<%
+  page_title = Typus::I18n.t("Applications")
+%>
 
-<% if admin_user.applications.any? %>
-  <% admin_user.applications.each do |app| %>
+<%
+  applications = admin_user.applications
 
-    <table>
+  # Detect if we are inside an application.
+  if (application = params[:application])
+    applications.each do |app|
+      if app.parameterize == application
+        applications = [app]
+      end
+    end
+    page_title = applications.first
+  end
+%>
+
+<h2><%= page_title %></h2>
+
+<% if applications.any? %>
+  <% applications.each do |app| %>
+
+    <table style="margin-bottom: 1em;">
+
+      <% table_header = application ? "Models" : app %>
 
       <thead>
         <tr>
-          <th><%= Typus::I18n.t(app) %></th>
+          <th><%= Typus::I18n.t(table_header) %></th>
         </tr>
       </thead>
 
       <% admin_user.application(app).map { |i| i.constantize }.each do |klass| %>
-        <tr class="<%= cycle("even", "odd") %>">
-          <td>
-            <%= link_to klass.model_name.human.pluralize, :controller => "/admin/#{klass.to_resource}" %>
-          </td>
-        </tr>
+        <% if klass.typus_options_for(:hide_from_dashboard) == false %>
+          <tr class="<%= cycle("even", "odd") %>">
+            <td>
+              <%= link_to klass.model_name.human.pluralize, :controller => "/admin/#{klass.to_resource}" %>
+            </td>
+          </tr>
+        <% end %>
       <% end %>
 
     </table>

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

@@ -0,0 +1,9 @@
+<p>Hello <%= @user.to_label %>!</p>
+
+<p>Someone has requested a link to change your password, and you can do this through the link below.</p>
+
+<p><%= link_to 'Change my password', admin_account_url(@user.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/admin/mailer/reset_password_instructions.text.erb

@@ -0,0 +1,9 @@
+Hello <%= @user.to_label %>!
+
+Someone has requested a link to change your password, and you can do this through the link below.
+
+<%= admin_account_url(@user.token) %>
+
+If you didn't request this, please ignore this email.
+
+Your password won't change until you access the link above and create a new one.

data/app/views/admin/resources/edit.html.erb

@@ -9,27 +9,17 @@
     <small><%= list_actions %></small>
   </h2>
 
-  <% if flash[:notice] && headless_mode? %>
-    <script>
-      $(document).ready(function() { parent.location.reload(); });
-    </script>
-  <% end %>
-
   <%= display_flash_message %>
   <%= render 'edit' %>
 
-  <%
-    options = params.dup.cleanup.merge!(:action => 'update')
-    button = Typus::I18n.t("Save %{resource}", :resource => @resource.model_name.human)
-  %>
-
-  <%= render :partial => 'form', :locals => { :options => options, :button => button } %>
+  <% locals = { :options => params.dup.cleanup.merge!(:action => 'update') } %>
+  <%= render 'form', locals %>
 
   <%= typus_relationships unless headless_mode? %>
 <% end %>
 
 <div class="grid_2">
-  <%= build_sidebar.present? ? build_sidebar : render("admin/templates/profile_sidebar") %>
+  <%= build_sidebar || render("admin/templates/profile_sidebar") %>
 </div>
 
 <div class="grid_8">

data/app/views/admin/resources/index.html.erb

@@ -16,14 +16,21 @@
 
   <ul class="predefined_filters">
     <li><%= link_to Typus::I18n.t("All"), params.dup.cleanup.merge(:action => 'index') %> (<%= resource.count %>)</li>
+
+    <% scopes.each do |scope| %>
+      <li><%= link_to Typus::I18n.t(scope.humanize), :scope => scope %> <%= "(#{@resource.send(scope).count})" %></li>
+    <% end %>
+
     <% predefined_filters.each do |filter, action, scope| %>
       <% url = action.is_a?(String) ? params.dup.cleanup.merge(:action => action) : action %>
       <li><%= link_to Typus::I18n.t(filter), url %> <%= "(#{@resource.send(scope).count})" if scope && @resource.respond_to?(scope) %></li>
     <% end %>
-    <% unless resource.count.zero? %>
+
+    <% if resource.any? && (formats = resource.typus_options_for(:export).extract_settings).any? %>
       <li>|</li>
-      <li><%= link_to "CSV", :format => 'csv' %></li>
-      <li><%= link_to "XML", :format => 'xml' %></li>
+      <% formats.each do |format| %>
+        <li><%= link_to format.upcase, :format => format %></li>
+      <% end %>
     <% end %>
   </ul>
 
@@ -42,7 +49,7 @@
     <% end %>
     <%= paginate(@items, Typus.pagination) %>
   <% else %>
-    <p><%= Typus::I18n.t("No %{resources} found.", :resources => @resource.model_name.human.downcase.pluralize) %></p>
+    <p><%= Typus::I18n.t("No %{resources} found.", :resources => @resource.model_name.human(:count => 2)) %></p>
   <% end %>
 
 <% end %>

data/app/views/admin/resources/new.html.erb

@@ -12,8 +12,8 @@
   <%= display_flash_message %>
   <%= render 'new' %>
 
-  <%= render :partial => 'form',
-             :locals => { :options => params.dup.cleanup.merge(:action => 'create') } %>
+  <% locals = { :options => params.dup.cleanup.merge(:action => 'create') } %>
+  <%= render 'form', locals %>
 <% end %>
 
 <div class="grid_2">

data/app/views/admin/resources/show.html.erb

@@ -19,7 +19,7 @@
     <% end %>
   </dl>
 
-  <%= typus_relationships %>
+  <%= typus_relationships unless headless_mode? %>
 <% end %>
 
 <div class="grid_2">

data/app/views/admin/shared/_head.html.erb

@@ -6,8 +6,8 @@
 
 <title><%= Typus.admin_title %> &mdash; <%= yield :title %></title>
 
-<%= stylesheet_link_tag :typus %>
-<%= javascript_include_tag :typus %>
+<%= stylesheet_link_tag 'typus/application' %>
+<%= javascript_include_tag 'typus/application' %>
 
 <%= yield :stylesheets -%>
 <%= yield :javascripts -%>

data/app/views/admin/templates/_belongs_to.html.erb

@@ -1,11 +1,8 @@
-<%
-  if @resource.typus_field_options_for(:read_only).include?(attribute.to_sym)
-    html_options.merge!(:disabled => 'disabled')
-    message = Typus::I18n.t("Read only")
-  end
-%>
-
 <li id="<%= attribute_id %>">
-  <%= form.label related_fk, "#{label_text} <small>#{message}</small>".html_safe %>
-  <%= form.select related_fk, values, options, html_options %>
+  <%= form.label attribute, label_text %>
+  <% if values.any? %>
+    <%= form.select related_fk, values, options, html_options.merge(:class => "chzn-select", :style => "width: 350px;") %>
+  <% else %>
+    <%= Typus::I18n.t("No %{resources} found.", :resources => related.model_name.human.downcase.pluralize) %>
+  <% end %>
 </li>

data/app/views/admin/templates/_dragonfly.html.erb

@@ -1,6 +1,6 @@
 <li id="<%= attribute_id %>">
   <%= form.label attribute, link_to_detach_attribute_for_dragonfly(attribute) %>
+  <%= typus_dragonfly_form_preview(@item, attribute) %>
   <%= form.file_field attribute, options %>
   <%= form.hidden_field "retained_#{attribute}" %>
-  <%= typus_dragonfly_preview(@item, attribute) %>
 </li>

data/app/views/admin/templates/_dragonfly_form_preview.html.erb

@@ -0,0 +1,21 @@
+<div style="margin: 0 0 0.5em 0;">
+
+  <div style="float: left;">
+    <%= link_to preview, :class => "fancybox" do %>
+      <%= image_tag thumb, options.merge(:alt => preview) %>
+    <% end %>
+  </div>
+
+  <div style="float: left;">
+    <ul style="margin: 0 0 0 15px!important;">
+      <li><strong>File name:</strong> <%= attachment.name %></li>
+      <li><strong>File type:</strong> <%= attachment.mime_type %></li>
+      <% if @item.respond_to?(:created_at) %>
+        <li><strong>Upload date:</strong> <%= @item.created_at %></li>
+      <% end %>
+      <li><strong>Dimensions:</strong> <%= attachment.width %> x <%= attachment.height %></li>
+    </ul>
+  </div>
+
+  <div class="clear"></div>
+</div>

data/app/views/admin/templates/_dragonfly_preview.html.erb

@@ -1,3 +1,3 @@
 <%= link_to preview, :class => "fancybox" do %>
-  <%= image_tag thumb, options.merge(:alt => preview) %>
+  <%= image_tag thumb, :alt => preview %>
 <% end %>

data/app/views/admin/templates/_has_and_belongs_to_many.html.erb

@@ -0,0 +1,15 @@
+<li id="<%= attribute_id %>">
+  <%= form.label attribute, label_text %>
+  <% if related_items.any? %>
+    <%= hidden_field_tag related_ids %>
+    <%= select_tag related_ids,
+                   options_from_collection_for_select(related_items, "id", "to_label", values.map(&:id)),
+                   html_options.merge(:multiple => true,
+                                      :id => "#{@resource.name.downcase}_#{attribute}",
+                                      :class => "chzn-select",
+                                      :style => "width: 550px;",
+                                      "data-placeholder" => Typus::I18n.t("Select Some Options")) %>
+  <% else %>
+    <%= Typus::I18n.t("No %{resources} found.", :resources => related_klass.model_name.human.downcase.pluralize) %>
+  <% end %>
+</li>

data/app/views/admin/templates/_password.html.erb

@@ -1,4 +1,4 @@
 <li id="<%= attribute_id %>">
   <%= form.label attribute, label_text %>
-  <%= form.password_field attribute, options %>
+  <%= form.password_field attribute, options.merge(:value => @item.send(attribute), :class => 'text') %>
 </li>

data/app/views/admin/templates/_selector.html.erb

@@ -1,14 +1,4 @@
-<%
-  custom = { :include_blank => true }
-  options.merge!(custom)
-
-  if @resource.typus_field_options_for(:read_only).include?(attribute.to_sym)
-    html_options.merge!(:disabled => 'disabled')
-    message = Typus::I18n.t("Read only")
-  end
-%>
-
 <li id="<%= attribute_id %>">
-  <%= form.label attribute, "#{label_text} <small>#{message}</small>".html_safe %>
+  <%= form.label attribute, label_text %>
   <%= form.select attribute, @resource.send(attribute.pluralize), options, html_options %>
 </li>

data/app/views/admin/templates/_string.html.erb

@@ -1,22 +1,4 @@
-<%
-
-  # Read only fields.
-  if @resource.typus_field_options_for(:read_only).include?(attribute.to_sym)
-    custom = { :readonly => 'readonly' }
-    label_text << " <small>#{Typus::I18n.t("Read only")}</small>"
-  end
-
-  # Auto generated fields.
-  if @resource.typus_field_options_for(:auto_generated).include?(attribute.to_sym)
-    custom = { :auto_generated => true }
-    label_text << " <small>#{Typus::I18n.t("Auto generated")}</small>"
-  end
-
-  options.merge!(custom) if custom
-
-%>
-
 <li id="<%= attribute_id %>">
-  <%= form.label attribute, label_text.html_safe %>
-  <%= form.text_field attribute, options %>
+  <%= form.label attribute, label_text %>
+  <%= form.text_field attribute, options.merge(:class => 'text') %>
 </li>

data/app/views/admin/templates/_string_with_preview.html.erb

@@ -1,8 +1,7 @@
 <%
   unless @item.new_record?
-    label_text << " <small>"
-    label_text << link_to(Typus::I18n.t("Preview"), send("#{@item.class.model_name.downcase}_path",@item.to_param), :target => "_blank")
-    label_text << "</small>"
+    text = link_to(Typus::I18n.t("Preview"), send("#{@item.class.model_name.downcase}_path",@item.to_param), :target => "_blank")
+    label_text << "<small>#{text}</small>"
   end
 %>
 

data/app/views/admin/templates/_text.html.erb

@@ -1,12 +1,5 @@
 <%
-  custom = {:rows => @resource.typus_options_for(:form_rows)}
-
-  # Read only fields.
-  if @resource.typus_field_options_for(:read_only).include?(attribute.to_sym)
-    custom.merge!(:readonly => 'readonly')
-    label_text << " <small>#{Typus::I18n.t("Read only")}</small>"
-  end
-
+  custom = { :rows => @resource.typus_options_for(:form_rows) }
   options = options.merge!(custom)
 %>
 

data/app/views/admin/templates/_text_with_ckeditor.html.erb

@@ -10,7 +10,7 @@
     $(document).ready(function() {
       // var config = { toolbar: 'Basic', };
       // var config = { toolbar: 'Full', };
-      var config = { toolbar: [['Bold', 'Italic', 'Underline', '-', 'NumberedList', 'BulletedList', '-', 'Undo', 'Redo', '-', 'SelectAll']] };
+      var config = { toolbar: [['Source', '-', 'Bold', 'Italic', 'Underline', '-', 'NumberedList', 'BulletedList', '-', 'Undo', 'Redo', '-', 'Maximize']] };
       $(".rich_text").ckeditor(config);
     });
   </script>