alchemy_cms 2.8.3 → 2.9.0

data/app/views/alchemy/admin/dashboard/_locked_pages.html.erb

@@ -8,7 +8,7 @@
   <% else %>
     <% @locked_pages.each do |page| %>
     <tr class="<%= cycle('even', 'odd', :name => 'locked_pages') %>">
-      <% if current_user.id == page.locked_by %>
+      <% if current_alchemy_user.id == page.locked_by %>
       <td>
         <%= link_to(page.name, alchemy.edit_admin_page_path(page)) %>
       </td>

data/app/views/alchemy/admin/dashboard/_recent_pages.html.erb

@@ -9,7 +9,7 @@
     <% @last_edited_pages.each do |page| %>
     <tr class="<%= cycle('even', 'odd', :name => 'edited_pages') %>">
       <td>
-        <%= link_to_if((page.locked_by.blank? || page.locked_by == current_user.id), page.name, edit_admin_page_path(page)) %>
+        <%= link_to_if((page.locked_by.blank? || page.locked_by == current_alchemy_user.id), page.name, edit_admin_page_path(page)) %>
       </td>
       <td>
         <small><%= l(page.updated_at) %></small>

data/app/views/alchemy/admin/dashboard/_sites.html.erb

@@ -4,7 +4,7 @@
     <% @sites.each do |site| %>
     <tr class="<%= cycle('even', 'odd', :name => 'sites') %>">
       <td>
-        <%= link_to_unless(site == Alchemy::Site.current, site.name, login_url(:protocol => 'http://', :host => site.host, :user => {:login => current_user.login}), :target => '_blank') %>
+        <%= link_to_unless(site == Alchemy::Site.current, site.name, login_url(:protocol => 'http://', :host => site.host, :user => {:login => current_alchemy_user.login}), :target => '_blank') %>
       </td>
       <td><small><%= site.host %></small></td>
     </tr>

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

@@ -17,22 +17,28 @@
 ) %>
 
 <div id="dashboard">
+  <% if current_alchemy_user.respond_to?(:name) %>
   <h1>
     <% if @first_time -%>
-    <%= _t('Welcome, %{name}', name: current_user.firstname.blank? ? current_user.login : current_user.firstname) %>
+    <%= _t(:welcome_note, name: current_alchemy_user.name) %>
     <% else -%>
-    <%= _t('Welcome back, %{name}', name: current_user.firstname.blank? ? current_user.login : current_user.firstname) %>
+    <%= _t(:welcome_back_note, name: current_alchemy_user.name) %>
     <% end -%>
   </h1>
+  <% end %>
+  <% if @last_sign_at %>
   <p>
-    <small><%= _t('Your last login was on %{time}', time: l(current_user.last_sign_in_at)) unless current_user.last_sign_in_at.blank? %></small>
+    <small><%= _t('Your last login was on %{time}', time: l(@last_sign_at)) %></small>
   </p>
+  <% end %>
   <div class="column left">
     <%= render 'locked_pages' %>
     <%= render 'recent_pages' %>
   </div>
   <div class="column right">
-    <%= render 'users' %>
+    <% if @online_users %>
+      <%= render 'users' %>
+    <% end %>
     <% if multi_site? %>
       <%= render 'sites' %>
     <% end %>

data/app/views/alchemy/admin/pages/_page.html.erb

@@ -99,7 +99,7 @@
     <%- end -%>
     </div>
   </div>
-  <%- if @sorting || (!page.folded?(current_user) && !page.children.empty?) -%>
+  <%- if @sorting || (!page.folded?(current_alchemy_user) && !page.children.empty?) -%>
   <ul id="page_<%= page.id %>_children" class="level_<%= page.level %>_children">
     <%= render :partial => 'page', :collection => page.children %>
   </ul>

data/app/views/alchemy/admin/pages/update.js.erb

@@ -19,7 +19,7 @@ Alchemy.growl("<%= @notice -%>");
   $page = $('#page_<%= @page.id %>');
   Alchemy.overlayObserver($page);
 
-  <% if @page.locked? && @page.locker == current_user %>
+  <% if @page.locked? && @page.locker == current_alchemy_user %>
     $('#locked_page_<%= @page.id %> > a').html('<%= @page.name -%>');
   <% end %>
 

data/app/views/alchemy/{user_sessions → base}/leave.html.erb

@@ -2,9 +2,9 @@
   <h2><%= _t("You are about to leave Alchemy") %>.</h2>
   <p class="buttons">
     <label><%= _t("Do you want to") %></label>
-    <%= link_to _t('stay logged in'), alchemy.root_path, :class => 'button' %>
+    <%= link_to _t('stay logged in'), alchemy.root_path, class: 'button' %>
   </p>
-  <%= form_tag alchemy.logout_path, :method => :delete, :class => 'buttons' do %>
+  <%= form_tag Alchemy.logout_path, method: 'delete', class: 'buttons' do %>
     <label><%= _t('or to completly') %></label>
     <%= button _t(:logout), autofocus: true %>
   <% end %>

data/app/views/alchemy/base/permission_denied.js.erb

@@ -1,2 +1,3 @@
-Alchemy.closeCurrentWindow();
-window.location.href = '<%= alchemy.login_path %>';
+Alchemy.closeCurrentWindow(function() {
+  window.location.href = '<%= Alchemy.login_path %>';
+});

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

@@ -43,7 +43,7 @@
         <%= yield(:alchemy_main_navigation) %>
       </div>
       <div id="logout">
-        <% if current_user %>
+        <% if current_alchemy_user %>
           <%= link_to_overlay_window(
             "<span class='module icon exit'></span><label>#{_t(:leave)}</label>".html_safe,
             alchemy.leave_admin_path, {
@@ -58,7 +58,7 @@
         <% end %>
       </div>
     </div>
-    <% if current_user %>
+    <% if current_alchemy_user %>
     <div id="top_menu">
       <div id="sub_navigation">
         <%= admin_subnavigation %>
@@ -71,7 +71,10 @@
       </div>
       <div id="user_info">
         <%= select_tag 'change_locale', options_for_select(::I18n.available_locales.map { |l| [l.to_s.upcase, l] }, ::I18n.locale), :class => 'alchemy_selectbox tiny' %>
-        <%= _t('Logged in as') %> <%= current_user.name %>
+        <% if current_alchemy_user.respond_to?(:name) %>
+          <%= _t('Logged in as') %>
+          <%= current_alchemy_user.name %>
+        <% end %>
       </div>
     </div>
     <% end %>

data/config/alchemy/config.yml

@@ -183,14 +183,4 @@ link_target_options: [blank]
 # Should pages that redirect to an external url open the link in a new tab/window?
 open_external_links_in_new_tab: true
 
-# === Devise modules
-#
-# List of Devise modules that should be activated on the user model.
-#
-devise_modules:
-  - :database_authenticatable
-  - :trackable
-  - :validatable
-  - :timeoutable
-  - :recoverable
-  # - :encryptable # Uncomment this if you are upgrading from an Alchemy version < 2.5.0
+email_regexp: !ruby/regexp '/\A[^@\s]+@([^@\s]+\.)+[^@\s]+\z/'

data/config/alchemy/modules.yml

@@ -54,18 +54,6 @@
       controller: 'alchemy/admin/sites'
       action: index
 
-- name: users
-  engine_name: alchemy
-  navigation:
-    name: 'modules.users'
-    controller: 'alchemy/admin/users'
-    action: index
-    icon: users
-    sub_navigation:
-      - name: 'modules.users'
-        controller: 'alchemy/admin/users'
-        action: index
-
 - name: tags
   engine_name: alchemy
   navigation:

data/config/locales/alchemy.de.yml

@@ -291,7 +291,6 @@ de:
     "Successfully added content": "%{content} wurde hinzugefügt"
     "Successfully deleted content": "%{content} wurde gelöscht"
     "Successfully saved content position": "Die Position wurde gespeichert."
-    "Successfully signup admin user": "Admin Benutzer wurde erfolgreich eingerichtet."
     "Switch to Flash® Uploader": "Auf den Flash® Uploader wechseln"
     sitemap_editor_info: "Die Sitemap wird automatisch generiert"
     searchresults_editor_info: "Dieses Element stellt die Suchergebnisse dar. Es Bedarf keinerlei Anpassung."
@@ -310,8 +309,6 @@ de:
     "Warning!": "Achtung!"
     content_description_missing: "Warnung: Für diesen Content konnte die Vorlage nicht gefunden werden. Bitte überprüfen Sie die elements.yml Datei."
     element_description_missing: "Warnung! Für dieses Element konnte die Vorlage nicht gefunden werden. Bitte überprüfen Sie die elements.yml Datei."
-    "Welcome back, %{name}": "Willkommen zurück, %{name}!"
-    "Welcome, %{name}": "Willkommen, %{name}!"
     "Welcome to Alchemy": "Willkommen in Alchemy"
     "Who else is online": "Wer ist noch online"
     "Yes": "Ja"
@@ -321,8 +318,6 @@ de:
     "You may upload files with following extensions": "Sie können %{file_types_description} mit folgenden Endungen hochladen: %{file_types}"
     "You may upload any file": "Sie können jede Art von Datei hochladen."
     "Your last login was on %{time}": "Sie waren zuletzt angemeldet am %{time}."
-    "Your user credentials": "Ihre Zugangsdaten"
-    "Your Alchemy Login": "Ihre Alchemy Zugangsdaten"
     "Your last updated pages": "Ihre zuletzt bearbeiteten Seiten"
     "Your trash is empty": "Der Papierkorb ist leer"
     above: "darüber"
@@ -355,7 +350,6 @@ de:
     confirm_to_delete_images_from_server: "Wollen Sie diese Bilder wirklich vom Server löschen?"
     confirm_to_delete_language: "Wollen Sie diese Sprache wirklich löschen?<br/>ACHTUNG! Alle zugehörigen Seiten werden ebenfalls gelöscht!"
     confirm_to_delete_page: "Wollen Sie diese Seite wirklich löschen? Alle Inhalte gehen dabei unwiderruflich verloren!"
-    confirm_to_delete_user: "Wollen Sie diesen Benutzer wirklich löschen?"
     contactform_body: "Nachrichten Vorlage"
     content_essence_not_found: "Essenz wurde nicht gefunden"
     content_not_found: "Das Feld für diesen Inhalt ist nicht vorhanden."
@@ -372,7 +366,6 @@ de:
     "Create site": "Eine neue Website erstellen"
     create_language_tree_heading: "Einen leeren Sprachbaum erstellen"
     create_page: "Eine Unterseite anlegen"
-    create_user: "Einen Benutzer anlegen"
     currently_edited_by: "Wird bearbeitet von"
     cut_element: "Element ausschneiden"
     delete_file: "Datei vom Server löschen"
@@ -380,7 +373,6 @@ de:
     delete_language: "Sprache löschen"
     delete_page: "Seite löschen"
     delete_tag: 'Tag löschen'
-    delete_user: "Benutzer löschen"
     document: "Dokument"
     documents: "Dateien"
     download_csv: "CSV runterladen"
@@ -393,7 +385,6 @@ de:
     edit_page: "Seite bearbeiten"
     edit_page_properties: "Seiteneigenschaften bearbeiten"
     edit_tag: 'Tag bearbeiten'
-    edit_user: "Benutzer bearbeiten"
     edit_selected_pictures: "Selektierte Bilder:"
     element_editor_not_found: "Bei diesem Element ist ein Fehler aufgetreten"
     element_of_type: "Element"
@@ -454,7 +445,6 @@ de:
     meta_description: "Meta Beschreibung"
     meta_keywords: "Meta Tags"
     modules:
-      user_sessions: "Anmeldung"
       attachments: "Dateien"
       dashboard: "Dashboard"
       pictures: "Bilder"
@@ -462,7 +452,6 @@ de:
       layoutpages: "Globale Seiten"
       library: "Bibliothek"
       pages: "Seiten"
-      users: "Benutzer"
       tags: "Tags"
       sites: "Websites"
     name: "Name"
@@ -584,11 +573,12 @@ de:
     upload_file: "Datei(en) hochladen"
     upload_image: "Bild(er) hochladen"
     url_name: "URL-Name"
-    username: "Benutzername"
     visible: "sichtbar"
     want_to_create_new_language: "Wollen Sie einen neuen leeren Sprachbaum erstellen?"
     want_to_make_copy_of_existing_language: "Wollen Sie eine Kopie eines vorhanden Sprachbaums machen?"
     "We need at least one default.": "Es muss eine Standardsprache geben."
+    welcome_note: "Willkommen %{name}"
+    welcome_back_note: "Willkommen zurück %{name}"
     welcome_please_identify_notice: "Willkommen! Bitte identifizieren Sie sich."
     width: "Breite"
     without_tag: 'Ohne Tag'
@@ -608,8 +598,6 @@ de:
     "Succesfully created": "Erfolgreich erstellt"
     "Succesfully updated": "Erfolgreich aktualisiert"
     "Succesfully removed": "Erfolgreich gelöscht"
-    "You are already logged in": "Sie sind bereits angemeldet."
-    "No users found": "Keine Benutzer gefunden."
     "Nothing found": "Keine Einträge gefunden."
     "Or drag files over here": "Oder ziehen Sie die Dateien hier rauf"
     "Now drop the files": "Lassen Sie die Dateien nun los"
@@ -785,13 +773,7 @@ de:
       alchemy/picture:
         attributes:
           image_file:
-            blank: "^Bitte fügen Sie ein Bild an."
-      alchemy/user:
-        attributes:
-          login:
-            invalid: "darf nur aus Buchstaben, Zahlen, Leerzeichen und .-_@ bestehen."
-          email:
-            invalid: "entspricht nicht dem Format einer E-Mail-Adresse."
+            blank: "Bitte fügen Sie ein Bild an."
 
   activemodel:
 
@@ -843,10 +825,6 @@ de:
         one: Bild
         other: Bilder
 
-      alchemy/user:
-        one: Benutzer
-        other: Benutzer
-
       alchemy/site:
         one: Website
         other: Websites
@@ -926,21 +904,6 @@ de:
         name: "Name"
         tag_list: Tags
 
-      alchemy/user:
-        email: "E-Mail"
-        firstname: "Vorname"
-        gender: "Anrede"
-        language: "Sprache"
-        lastname: "Nachname"
-        last_sign_in_at: "letzter Login am"
-        login: "Benutzername"
-        name: "Name"
-        password: "Passwort"
-        password_confirmation: "Passwort Bestätigung"
-        roles: "Benutzerrollen"
-        tag_list: Tags
-        send_credentials: "Sende Benutzerdaten per E-Mail"
-
       alchemy/site:
         name: "Bezeichnung"
         host: "primäre Domain"

data/config/locales/alchemy.en.yml

@@ -193,7 +193,6 @@ en:
     confirm_to_delete_image: "Do you really want to delete this image from server?"
     confirm_to_delete_image_from_server: "Do you really want to delete this image from the server?"
     confirm_to_delete_images_from_server: "Do you really want to delete these images from the server?"
-    confirm_to_delete_user: "Do you really want to delete this user?"
     contactform_body: "Message Template"
     content_description_missing: "Warning: Content is missing its description. Please check the elements.yml"
     content_essence_not_found: "Content essence not found"
@@ -209,7 +208,6 @@ en:
     "Create site": "Create a new site"
     create_language_tree_heading: "Create empty language tree"
     create_page: "Create a new subpage"
-    create_user: "Create a new user"
     created_at: "Created at"
     currently_edited_by: "This page is locked by"
     cut_element: "Cut this element."
@@ -217,7 +215,6 @@ en:
     delete_image: "Remove this image"
     delete_language: "Delete this language"
     delete_page: "Delete this page"
-    delete_user: "Delete this user"
     document: "File"
     documents: "Files"
     download_csv: "Download CSV"
@@ -230,7 +227,6 @@ en:
     edit_page: "Edit this page"
     edit_page_properties: "Edit the page´s properties."
     edit_selected_pictures: "Edit selected pictures"
-    edit_user: "Edit the user´s properties."
     element_description_missing: "WARNING! Missing description. Please check your elements.yml file."
     element_dirty_close_window_notice: "You have unsaved elements. Do you really want to close the elements window?"
     element_editor_not_found: "Error within this Element"
@@ -284,7 +280,6 @@ en:
     meta_description: "Meta-Description"
     meta_keywords: "Meta-Keywords"
     modules:
-      user_sessions: "Login"
       attachments: "Files"
       dashboard: "Dashboard"
       pictures: "Images"
@@ -292,7 +287,6 @@ en:
       layoutpages: "Global Pages"
       library: "Library"
       pages: "Pages"
-      users: "Users"
       tags: "Tags"
       sites: "Sites"
     name: "Name"
@@ -305,7 +299,6 @@ en:
     no_images_in_archive: "You don't have any images in your archive."
     no_more_elements_to_add: "No more elements available."
     no_search_results: "Your search did not return any results."
-    "No users found": "No users found."
     "not a valid image": "This is not an valid image."
     "Page created": "Page: '%{name}' created."
     page_for_links:
@@ -399,10 +392,11 @@ en:
     upload_file: "Upload file(s)"
     upload_image: "Upload image(s)"
     url_name: "URL-Name"
-    username: "Username"
     want_to_create_new_language: "Do you want to create a new empty language tree?"
     want_to_make_copy_of_existing_language: "Do you want to copy an existing language tree?"
     "Welcome to Alchemy": "Welcome to Alchemy"
+    welcome_note: "Welcome %{name}"
+    welcome_back_note: "Welcome back %{name}"
     welcome_please_identify_notice: "Welcome! Please identify."
     width: "Width"
     "You are already logged in": "You are already logged in."
@@ -666,20 +660,6 @@ en:
         image_file_size: "Filesize"
         name: "Name"
 
-      alchemy/user:
-        email: "Email"
-        firstname: "Firstname"
-        gender: "Gender"
-        language: "Language"
-        lastname: "Lastname"
-        last_sign_in_at: "Last Login At"
-        login: "Username"
-        name: "Name"
-        password: "Password"
-        password_confirmation: "Password confirmation"
-        role: "Userrole"
-        send_credentials: "Send email with credentials"
-
       alchemy/site:
         host: primary Host
 

data/config/routes.rb

@@ -15,31 +15,6 @@ Alchemy::Engine.routes.draw do
   get '/admin/dashboard/update_check' => 'admin/dashboard#update_check',
         :as => :update_check
 
-  devise_scope :user do
-    get '/admin/login' => 'user_sessions#new', :as => :login
-    post '/admin/login' => 'user_sessions#create', :as => :login
-    delete '/admin/logout' => 'user_sessions#destroy', :as => :logout
-    get '/admin/dashboard' => 'admin/dashboard#index', :as => :user_root
-    get '/admin/leave' => 'user_sessions#leave', :as => :leave_admin
-    get '/admin/passwords' => 'passwords#new', :as => :new_password
-    get '/admin/passwords/:id/edit/:reset_password_token' => 'passwords#edit', :as => :edit_password
-    post '/admin/passwords' => 'passwords#create', :as => :password
-    put '/admin/passwords' => 'passwords#update', :as => :password
-  end
-
-  # This actualy does all the Devise magic. I.e. current_user method in ApplicationController
-  devise_for(
-    :user,
-    :class_name => 'Alchemy::User',
-    :controllers => {
-      :sessions => 'alchemy/user_sessions'
-    },
-    :skip => [:sessions, :passwords] # skipping Devise default routes.
-  )
-
-  get '/admin/signup' => 'users#new', :as => :signup
-  post '/admin/signup' => 'users#create', :as => :signup
-
   get '/attachment/:id/download(/:name)' => 'attachments#download',
         :as => :download_attachment
   get '/attachment/:id/show' => 'attachments#show',
@@ -57,13 +32,13 @@ Alchemy::Engine.routes.draw do
   get "/pictures/:id/thumbnails/:size(/:crop)(/:crop_from/:crop_size)/:name.:format" => 'pictures#thumbnail',
         :as => :thumbnail, :defaults => {:format => 'png', :name => "thumbnail"}
 
+  get '/admin/leave' => 'base#leave', :as => :leave_admin
+
   resources :messages, :only => [:index, :new, :create]
   resources :elements, :only => :show
 
   namespace :admin do
 
-    resources :users
-
     resources :contents do
       collection do
         post :order

data/db/migrate/20130827094554_alchemy_two_point_six.rb

@@ -265,37 +265,6 @@ class AlchemyTwoPointSix < ActiveRecord::Migration
     add_index "alchemy_sites", ["host", "public"], :name => "alchemy_sites_public_hosts_idx"
     add_index "alchemy_sites", ["host"], :name => "index_alchemy_sites_on_host"
 
-    create_table "alchemy_users", :force => true do |t|
-      t.string   "firstname"
-      t.string   "lastname"
-      t.string   "login"
-      t.string   "email"
-      t.string   "gender"
-      t.string   "roles",                                 :default => "registered"
-      t.string   "language"
-      t.string   "encrypted_password",     :limit => 128, :default => "",           :null => false
-      t.string   "password_salt",          :limit => 128, :default => "",           :null => false
-      t.integer  "sign_in_count",                         :default => 0,            :null => false
-      t.integer  "failed_attempts",                       :default => 0,            :null => false
-      t.datetime "last_request_at"
-      t.datetime "current_sign_in_at"
-      t.datetime "last_sign_in_at"
-      t.string   "current_sign_in_ip"
-      t.string   "last_sign_in_ip"
-      t.datetime "created_at",                                                      :null => false
-      t.datetime "updated_at",                                                      :null => false
-      t.integer  "creator_id"
-      t.integer  "updater_id"
-      t.text     "cached_tag_list"
-      t.string   "reset_password_token"
-      t.datetime "reset_password_sent_at"
-    end
-
-    add_index "alchemy_users", ["email"], :name => "index_alchemy_users_on_email", :unique => true
-    add_index "alchemy_users", ["login"], :name => "index_alchemy_users_on_login", :unique => true
-    add_index "alchemy_users", ["reset_password_token"], :name => "index_alchemy_users_on_reset_password_token", :unique => true
-    add_index "alchemy_users", ["roles"], :name => "index_alchemy_users_on_roles"
-
     create_table "events", :force => true do |t|
       t.string   "name"
       t.string   "hidden_name"