typus 3.1.0.rc18 → 3.1.0.rc19

data/app/views/admin/templates/_text_with_ckeditor_and_assets.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>
@@ -22,14 +22,17 @@
 %>
 
 <%
-  input = "#{@resource.model_name.underscore.gsub("/", "_")}_#{attribute}"
-  label_text << <<-DATA
-<small>
-  #{link_to "Insert picture",
-            {:controller => "/admin/assets", :layout => 'admin/headless', :input => input},
-            {:class => "iframe", :style => "font-size: 10px; background: black; color: white; padding: 2px 5px; -moz-border-radius: 3px; -webkit-border-radius: 3px;"}}
-</small>
-  DATA
+  unless options[:disabled] == true
+    input = "#{@resource.model_name.underscore.gsub("/", "_")}_#{attribute}"
+    insert_picture = <<-DATA
+  <small>
+    #{link_to "Insert picture",
+              {:controller => "/admin/assets", :layout => 'admin/headless', :input => input},
+              {:class => "iframe", :style => "font-size: 10px; background: black; color: white; padding: 2px 5px; -moz-border-radius: 3px; -webkit-border-radius: 3px;"}}
+  </small>
+    DATA
+    label_text << insert_picture.html_safe
+  end
 %>
 
 <li id="<%= attribute_id %>">

data/app/views/helpers/admin/base/_apps.html.erb

@@ -1,17 +1,25 @@
 <ul>
 
-  <% dashboard = 'active' if params[:controller].include?('dashboard') %>
+  <%
+    if !params[:application] && params[:controller].include?('dashboard')
+      dashboard = 'active'
+    end
+  %>
 
-  <li><%= link_to Typus::I18n.t("Dashboard"), admin_dashboard_path, :class => dashboard %></li>
+  <li><%= link_to Typus::I18n.t("Dashboard"), admin_dashboard_index_path, :class => dashboard %></li>
 
   <% admin_user.applications.each do |application| %>
 
+    <% app_id = application.parameterize %>
+
     <%
       apps = admin_user.application(application)
-      klass = 'active' if (@resource && apps.include?(@resource.model_name))
+      if (params[:application] == app_id) || (@resource && apps.include?(@resource.model_name))
+        klass = 'active'
+      end
     %>
 
-    <li><%= link_to Typus::I18n.t(application), { :controller => "/admin/#{apps.first.tableize}" }, { :class => klass } %></li>
+    <li><%= link_to Typus::I18n.t(application), admin_dashboard_path(app_id), { :class => klass } %></li>
 
   <% end %>
 

data/app/views/helpers/admin/base/_login_info.html.erb

@@ -1,4 +1,4 @@
 <ul>
-  <li><%= Typus::I18n.t("Logged as") %> <%= link_to admin_user.to_label, { :controller => "/admin/#{Typus.user_class.to_resource}", :action => 'edit', :id => admin_user.id } %></li>
+  <li><%= Typus::I18n.t("Logged in as") %> <%= link_to admin_user.to_label, { :controller => "/admin/#{Typus.user_class.to_resource}", :action => 'edit', :id => admin_user.id } %></li>
   <li><%= link_to Typus::I18n.t("Sign out"), admin_sign_out_path, :confirm => Typus::I18n.t("Are you sure you want to sign out and end your session?") %></li>
 </ul>

data/app/views/helpers/admin/resources/_filters.html.erb

@@ -3,7 +3,8 @@
   <div id="filters">
     <ul>
       <% filters.each do |filter| %>
-        <li><%= select_tag filter[:filter], options_for_select(filter[:items], params[filter[:filter]]) %></li>
+        <% key, value = filter[:key], filter[:value] %>
+        <li><%= select_tag key, options_for_select(value, params[key]) %></li>
       <% end %>
 
       <% hidden_filters.each do |key, value| %>

data/app/views/helpers/admin/resources/_sidebar.html.erb

@@ -1,41 +1,25 @@
-<% if Typus.quick_sidebar %>
-  <h2><%= @resource.typus_application %></h2>
-
-  <ul>
-    <% resources.each do |resource, actions| %>
-      <% klass = resource.constantize %>
-      <li>
-        <%= link_to klass.model_name.human.pluralize, :controller => "/admin/#{klass.to_resource}" %>
-        <small>
-          <%= link_to Typus::I18n.t("Add New"), :controller => "/admin/#{klass.to_resource}", :action => "new" %>
-        </small>
-      </li>
-    <% end %>
-  </ul>
-<% else %>
-  <div id="sidebar">
-
-    <% resources.each do |resource, actions| %>
-
-      <% klass = resource.constantize %>
-
-      <ul>
-
-        <%= link_to :controller => "/admin/#{klass.to_resource}" do %>
-          <li class="header"><%= klass.model_name.human.pluralize %></li>
-        <% end %>
-
-        <% if @resource.model_name.eql?(resource) %>
-          <ul>
-            <% actions.each do |action| %>
-              <li><%= link_to action[:message], action[:url] %></li>
-            <% end %>
-          </ul>
-        <% end %>
-
-      </ul>
-
-    <% end %>
-
-  </div>
-<% end %>
+<div id="sidebar">
+
+  <% resources.each do |resource, actions| %>
+
+    <% klass = resource.constantize %>
+
+    <ul>
+
+      <%= link_to :controller => "/admin/#{klass.to_resource}" do %>
+        <li class="header"><%= klass.model_name.human.pluralize %></li>
+      <% end %>
+
+      <% if @resource.model_name.eql?(resource) %>
+        <ul>
+          <% actions.each do |action| %>
+            <li><%= link_to action[:message], action[:url] %></li>
+          <% end %>
+        </ul>
+      <% end %>
+
+    </ul>
+
+  <% end %>
+
+</div>

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

@@ -36,7 +36,7 @@
       <div class="container_12">
         <div class="grid_12">
           <span class="copyright">
-            Powered by <%= link_to "Typus", "http://core.typuscms.com/" %> &#183; <%= Typus.admin_sub_title.html_safe %>
+            Powered by <%= link_to "Typus", "http://core.typuscmf.com/" %> &#183; <%= Typus.admin_sub_title.html_safe %>
           </span>
         </div>
       </div>

data/config/locales/typus.ca.yml

@@ -32,7 +32,7 @@ ca:
   "Last few days": "Últims dies"
   "Last 30 days": "Últims 30 dies"
   "Last 7 days": "Últims 7 dies"
-  "Logged as": "Identificat com"
+  "Logged in as": "Identificat com"
   "Login": "Login"
 
   "New": "Nou"

data/config/locales/typus.de.yml

@@ -1,79 +1,84 @@
 # German (de) translations for Typus by:
 # - Michael Grunewalder <http://michael.grunewalder.com>
+# - Thomas von Deyen <http://thomas.vondeyen.com>
 
 de:
-
   "Actions": "Aktionen"
-  "Active":
-  "Add": "Zuf&uuml;gen"
+  "Active": "Aktiv"
+  "List" : 'Liste'
+  "Add": "Hinzufügen"
   "Add New": "Erstellen"
-  "Are you sure?":
+  "All" : 'Alle'
+  "Are you sure?": "Sind Sie sicher?"
   "Are you sure you want to sign out and end your session?": "Wollen Sie sich abmelden und die Sitzung beenden?"
+  "Assign": "Zuweisen"
 
-  "Change %{attribute}?": "%{attribute}&auml;ndern?"
-  "Create %{resource}": "Erstellen %{resource}"
+  "Change %{attribute}?": "%{attribute} ändern?"
+  "Create %{resource}": "%{resource} erstellen"
 
   "Dashboard": "Dashboard"
   "Down": "Runter"
 
   "Edit": "Bearbeiten"
-  "Edit %{resource}": "Bearbeiten %{resource}"
+  "Edit %{resource}": "%{resource} bearbeiten"
   "Enter your email below to create the first user": "Geben Sie Ihre Email Adresse unten ein, um den ersten Benutzer zu erstellen"
 
-  "False": "Falsch"
+  "False": "Nein"
   "Filter": "Filter"
 
   "I remember my password": "Ich erinnere mein Passwort"
-  "If you didn't request a password update, you can ignore this message": "Falls Sie keine Passwort &Auml;derung beantragt haben, k&ouml;nnen Sie diese nachricht ignorieren"
-  "If you have made any changes to the fields without clicking the Save/Update entry button, your changes will be lost": "Wenn Sie &Auml;nderungen an Feldern vorgenommen haben, ohne den Speichern/Bearbeiten Knopf gedr7uuml;ckt zu haben, gehen diese &Auml;nderungen verloren"
+  "If you didn't request a password update, you can ignore this message": "Falls Sie keine Passwort Änderung beantragt haben, können Sie diese Nachricht ignorieren"
+  "If you have made any changes to the fields without clicking the Save/Update entry button, your changes will be lost": "Wenn Sie Änderungen an Feldern vorgenommen haben, ohne den Speichern/Bearbeiten Knopf gedrückt zu haben, gehen diese Änderungen verloren"
   "Inactive":
 
   "Last few days": "Letzten Tage"
   "Last 30 days": "Letzten 30 Tage"
   "Last 7 days": "Letzten 7 Tage"
-  "Logged as": "Aufgezeichnet als"
-  "Login": "Anmeldem"
+  "List" : "Liste"
+  "Logged in as": "Angemeldet als"
+  "Login": "Anmelden"
 
   "New": "Neu"
-  "New %{resource}": "Neu %{resource}"
-  "Next": "N&auml;chster"
-  "No %{resources} found":
+  "New %{resource}": "%{resource} erstellen"
+  "Next": "Nächste"
+  "No %{resources} found": "Keine %{resources} gefunden"
 
-  "Password recovery link sent to your email": "Der Link zur Wiederfindung des Passworts wurde an Ihre Email Adresse gechickt"
+  "Password recovery link sent to your email": "Der Link zur Wiederherstelllung Ihres Passworts wurde an Ihre Email Adresse geschickt"
   "Previous": "Vorheriger"
 
-  "Record moved %{to}": "Datensatz verschoben nach %{to}"
+  "Record moved %{to}": "Datensatz wurde verschoben nach %{to}"
   "Recover password": "Passwort vergessen?"
   "Remove": "Eintrag"
-  "Remove %{resource}?": "Eintrag %{resource}?"
-  "Reset password": "Passwort zur&uuml;cksetzen"
+  "Remove %{resource}?": "%{resource} entfernen?"
+  "Reset password": "Passwort zurücksetzen"
   "Resources": "Resourcen"
 
-  "Save %{resource}":
+  "Save %{resource}": "%{resource} speichern"
   "Search": "Suchen"
   "Show": "Anzeigen"
-  "Show all dates":
-  "Show by %{attribute}":
-  "Show %{resource}": "Anzeigen %{resource}"
+  "Show all dates": "Alle anzeigen"
+  "Show by %{attribute}": "An Hand von %{attribute} anzeigen"
+  "Show %{resource}": "%{resource} anzeigen"
   "Sign in": "Anmelden"
   "Sign out": "Abmelden"
   "Sign up": "Konto erstellen"
-  "System Users Administration": "System Benutzer Verwaltung"
+  "System Users Administration": "Admin Benutzer Verwaltung"
 
   "Today": "Heute"
-  "True": "Richtig"
+  "Trash": "Löschen"
+  "True": "Ja"
 
-  "Unrelate":
+  "Unrelate": "Trennen"
   "Up": "Hoch"
 
-  "View all %{attribute}":
-  "View site": "Site anzeigen"
+  "View all %{attribute}": "Alle %{attribute} anzeigen"
+  "View site": "Webseite anzeigen"
 
-  "You can update your password at": "Sie k7ouml;nnen Ihr Passwort &auml;ndern unter"
-  "You can't change your role": "Sie k&ouml;nnen Ihre Rolle nicht &auml;ndern"
-  "You can't toggle your status": "Sie k&ouml;nnen Ihren Status nicht umschalten"
+  "You can update your password at": "Sie können Ihr Passwort ändern unter"
+  "You can't change your role": "Sie können Ihre Rolle nicht ändern"
+  "You can't toggle your status": "Sie können Ihren Status nicht umschalten"
 
-  "%{errors} prohibited this page from being saved:":
-  "%{model} successfully created": "%{model} erfolgreich erstellt"
-  "%{model} successfully removed": "%{model} erfolgreich gel&ouml;scht"
-  "%{model} successfully updated": "%{model} erfolgreich ge&auml;ndert"
+  "%{errors} prohibited this page from being saved:": "%{errors} haben diese Seite davon abgehalten gespeichert zu werden:"
+  "%{model} successfully created": "%{model} wurde erfolgreich erstellt"
+  "%{model} successfully removed": "%{model} wurde erfolgreich gelöscht"
+  "%{model} successfully updated": "%{model} wurde erfolgreich geändert"

data/config/locales/typus.el.yml

@@ -32,7 +32,7 @@ el:
   "Last few days": "Τελευταίες ημέρες"
   "Last 30 days": "Τελευταίες 30 ημέρες"
   "Last 7 days": "Τελευταίες 7 ημέρες"
-  "Logged as": "Συνδεδεμένος ως"
+  "Logged in as": "Συνδεδεμένος ως"
   "Login": "Σύνδεση"
 
   "New": "Νέο"

data/config/locales/typus.es.yml

@@ -32,7 +32,7 @@ es:
   "Last few days": "Últimos dias"
   "Last 30 days": "Últimos 30 dias"
   "Last 7 days": "Últimos 7 dias"
-  "Logged as": "Autenticado como"
+  "Logged in as": "Autenticado como"
   "Login": "Login"
 
   "New": "Nuevo"

data/config/locales/typus.fr.yml

@@ -34,7 +34,7 @@ fr:
   "Last few days": "Ces derniers jours"
   "Last 30 days": "30 derniers jours"
   "Last 7 days": "7 derniers jours"
-  "Logged as": "Identifié comme"
+  "Logged in as": "Identifié comme"
   "Login": "Identification"
 
   "New": "Nouveau"

data/config/locales/typus.hu.yml

@@ -31,7 +31,7 @@ hu:
   "Last few days": "Utóbbi néhány nap"
   "Last 30 days": "Az elmúlt 30 nap"
   "Last 7 days": "Az elmúlt 7 nap"
-  "Logged as": "Bejelentkezve"
+  "Logged in as": "Bejelentkezve"
   "Login": "Belépés"
 
   "New": "Új"

data/config/locales/typus.it.yml

@@ -35,7 +35,7 @@ it:
   "Last 30 days": "Ultimi 30 giorni"
   "Last 7 days": "Ultimi 7 giorni"
   "Loading": "Caricamento"
-  "Logged as": "Loggato come"
+  "Logged in as": "Loggato come"
   "Login": "Login"
 
   "New": "Nuovo"

data/config/locales/typus.locale.models.yml.template

@@ -0,0 +1,17 @@
+# <locale> translations for Typus
+# - <your_name> <contact_form>
+
+<locale>:
+  activerecord:
+    models:
+      admin_user:
+    attributes:
+      admin_user:
+        email:
+        first_name:
+        last_name:
+        locale:
+        password:
+        password_confirmation:
+        role:
+        status:

data/config/locales/typus.locale.yml.template

@@ -0,0 +1,80 @@
+# <locale> translations for Typus
+# - <your_name> <contact_form>
+
+<locale>:
+
+  "Actions":
+  "Active":
+  "Add":
+  "Add New":
+  "All":
+  "Are you sure?":
+  "Are you sure you want to sign out and end your session?":
+
+  "Change %{attribute}?":
+  "Create %{resource}":
+
+  "Dashboard":
+  "Down":
+
+  "Edit":
+  "Enter your email below to create the first user":
+
+  "False":
+  "Filter":
+
+  "I remember my password":
+  "If you didn't request a password update, you can ignore this message":
+  "If you have made any changes to the fields without clicking the Save/Update entry button, your changes will be lost":
+  "Inactive":
+
+  "Last few days":
+  "Last 30 days":
+  "Last 7 days":
+  "Logged in as":
+  "Login":
+
+  "New":
+  "New %{resource}":
+  "Next":
+  "No %{resources} found":
+
+  "Password recovery link sent to your email":
+  "Previous":
+
+  "Record moved %{to}":
+  "Recover password":
+  "Remove":
+  "Remove %{resource}?":
+  "Reset password":
+  "Resources":
+
+  "Save %{resource}":
+  "Search":
+  "Show":
+  "Show all dates":
+  "Show by %{attribute}":
+  "Show %{resource}":
+  "Sign in":
+  "Sign out":
+  "Sign up":
+  "System Users Administration":
+
+  "Today":
+  "Trash":
+  "True":
+
+  "Unrelate":
+  "Up":
+
+  "View all %{attribute}":
+  "View site":
+
+  "You can update your password at":
+  "You can't change your role":
+  "You can't toggle your status":
+
+  "%{errors} prohibited this page from being saved:":
+  "%{model} successfully created":
+  "%{model} successfully removed":
+  "%{model} successfully updated":

data/config/locales/typus.pt-BR.yml

@@ -31,7 +31,7 @@ pt-BR:
   "Last few days": "Últimos dias"
   "Last 30 days": "Últimos 30 dias"
   "Last 7 days": "Últimos 7 dias"
-  "Logged as": "Logado como"
+  "Logged in as": "Logado como"
   "Login": "Login"
 
   "New": "Novo"