locomotive_cms 2.0.0.rc12 → 2.0.0

data/app/assets/stylesheets/locomotive/inline_editor.css

@@ -3,8 +3,9 @@
  * and any sub-directories. You're free to add application-wide styles to this file and they'll appear at
  * the top of the compiled file, but it's generally better to create a new file per style scope.
  *= require locomotive/blueprint/screen.css
- *= require locomotive/jquery
+ *= require locomotive/jquery/ui.css
  *= require locomotive/toggle.css
+ *= require locomotive/font-awesome
  *= require locomotive/backoffice/dialog_changes.css
  *= require locomotive/backoffice/content_assets.css
  *= require_tree ./shared

data/app/assets/stylesheets/locomotive/inline_editor/_buttons.css.scss

@@ -11,7 +11,7 @@
   line-height: 22px;
 
   margin: 0 5px;
-  padding: 0 14px;
+  padding: 0px 14px;
 
   @include border-radius(14px);
   @include background-image(linear-gradient(#303138, #1e1e24));
@@ -25,16 +25,6 @@
   text-decoration: none;
   @include single-text-shadow(rgba(0, 0, 0, 1), 1px, 1px, 1px);
 
-  em {
-    display: inline-block;
-    position: relative;
-    background: transparent image-url("locomotive/menu/icons.png") no-repeat 0 0px;
-    height: 11px;
-    width: 11px;
-    top: 2px;
-    left: -5px;
-  }
-
   &:hover {
     border: 1px solid rgba(255, 255, 255, 0.5);
     border-top: 1px solid rgba(255, 255, 255, 0.4);

data/app/assets/stylesheets/locomotive/inline_editor/toolbar.css.scss

@@ -81,15 +81,14 @@
     .lang {
       #content-locale-picker-link {
         @include button;
-
-        top: 8px;
       }
     }
 
     .back {
       a {
-        position: relative;
-        top: 7px;
+        color: #fff;
+        font-size: 20px;
+        text-decoration: none;
       }
     }
 

data/app/assets/stylesheets/locomotive/not_logged_in.css

@@ -3,5 +3,6 @@
  * and any sub-directories. You're free to add application-wide styles to this file and they'll appear at
  * the top of the compiled file, but it's generally better to create a new file per style scope.
  *= require locomotive/blueprint/screen.css
+ *= require locomotive/font-awesome
  *= require_tree ./not_logged_in
 */

data/app/assets/stylesheets/locomotive/not_logged_in/layout.css.scss

@@ -4,7 +4,12 @@
 @import "compass/css3/text-shadow";
 @import "../backoffice/buttons";
 
-body { background: #000 image-url("locomotive/background/body.png") repeat 0 0; }
+html { height: 100%; }
+
+body {
+  background: #000 image-url("locomotive/background/body.png") repeat 0 0;
+  height: 100%;
+}
 
 div.application-message {
   font-size: 1.2em;
@@ -25,17 +30,19 @@ div#flash-notice {
 }
 
 #wrapper {
-  background: transparent image-url("locomotive/simple/wrapper_bg.png") repeat-x 0 0;
-  min-height: 400px;
+  @include background-image(linear-gradient(top, rgba(102, 102, 115, 0.3), rgba(30, 30, 35, 0.3) 252px, rgba(30, 30, 35, 0.3)));
+  height: 100%;
 }
 
 #light {
-  background: transparent image-url("locomotive/simple/light_bg.png") no-repeat center 0;
-  min-height: 400px;
-  padding-top: 100px;
+  @include background-image(radial-gradient(top, rgba(255, 255, 255, 0.2), rgba(95, 95, 105, 0.3) 240px, rgba(30, 30, 35, 0.1) 370px));
+  height: 100%;
 }
 
 #panel {
+  position: relative;
+  top: 100px;
+
   width: 346px;
   padding: 0px;
 
@@ -110,11 +117,13 @@ div#flash-notice {
               width: auto;
               line-height: 14px;
               margin: 0px;
-              padding: 3px 12px 4px 27px;
+              padding: 3px 8px 4px 8px;
 
               @include box-shadow(rgba(0, 0, 0, 0.4) 2px 2px 2px 0);
               @include border-radius(3px);
-              background: #cd0f19 image-url("locomotive/form/icons/error.png") no-repeat 7px center;
+              background: #cd0f19;
+
+              &:before { font-family: FontAwesome; content: "\f071\00a0\00a0"; }
 
               color: #fff !important;
               font-size: 12px;

data/app/assets/stylesheets/locomotive/shared/_helpers.css.scss

@@ -44,15 +44,20 @@
 }
 
 @mixin editable {
-  padding: 2px 25px 2px 6px;
+  padding: 2px 6px 2px 6px;
   color: #1e1f26;
   outline: none;
   cursor: pointer;
 
+  &:after { font-family: FontAwesome; color: #e8e1ad; content: "\00a0"; }
+
   &:hover {
     text-decoration: none;
-    background: #fffbe5 image-url("locomotive/form/pen.png") no-repeat right 5px;
+    background: #fffbe5;
+
     border-bottom: 1px dotted #efe4a5;
+
+    &:after { font-family: FontAwesome; color: #e8e1ad; content: "\00a0\00a0\f040"; }
   }
 }
 
@@ -78,49 +83,24 @@
     padding-left: 10px;
   }
 
-  a.edit, a.remove, a.toggle, a.drag {
-    display: inline-block;
-    width: 16px;
-    height: 16px;
-
-    position: relative;
-    top: 4px;
-
-    outline: none;
-    text-indent: -9999px;
+  a.edit, a.drag, a.remove, a.toggle {
+    @include icon-button;
+  }
 
-    &.edit {
-      background: transparent image-url("locomotive/list/icons/pencil_off.png") repeat 0 0;
-      &:hover {
-        background-image: image-url("locomotive/list/icons/pencil.png");
-      }
-    }
+  a.edit:hover {
+    background: #f0c334;
+  }
 
-    &.remove {
-      background: transparent image-url("locomotive/list/icons/trash_off.png") repeat 0 0;
-      &:hover {
-        background-image: image-url("locomotive/list/icons/trash.png");
-      }
-    }
+  a.drag:hover {
+    background: #25a7ed;
+  }
 
-    &.toggle {
-      background: transparent image-url("locomotive/list/icons/toggle_off.png") repeat 0 0;
-      &:hover {
-        background-image: image-url("locomotive/list/icons/toggle.png");
-      }
-      &.open {
-        @include rotate(180deg);
-      }
-      @include single-transition(transform, 0.5s);
-    }
+  a.remove:hover {
+    background: #e72635;
+  }
 
-    &.drag {
-      cursor: move;
-      background: transparent image-url("locomotive/list/icons/move_off.png") repeat 0 0;
-      &:hover {
-        background-image: image-url("locomotive/list/icons/move.png");
-      }
-    }
+  a.toggle:hover {
+    background: #f3c526;
   }
 }
 

data/app/assets/stylesheets/locomotive/shared/common.css.scss

@@ -8,7 +8,8 @@ form.quick-upload {
   display: inline;
 
   input[type=file] {
-    visibility: hidden;
+    position: absolute;
+    left: -9999px;
   }
 
 }

data/app/assets/stylesheets/locomotive/shared/content_locale_picker.css.scss

@@ -5,31 +5,25 @@
   position: relative;
 
   padding-left: 10px !important;
-  padding-right: 25px !important;
+  padding-right: 10px !important;
 
   cursor: pointer;
 
-  .hand {
-    position: absolute;
-    top: 7px;
-    right: 7px;
-
-    height: 7px;
-    width: 12px;
-
-    background: transparent image-url("locomotive/menu/icons.png") no-repeat 0px -16px;
+  .caret {
+    margin-left: 5px;
+    color: #fff;
   }
 
   img.flag {
-    float: left;
+    vertical-align: middle;
 
     position: relative;
-    top: 1px;
+    top: -1px;
 
     width: 20px;
     height: 20px;
 
-    margin-right: 7px;
+    margin-right: 2px;
   }
 
   span.text {
@@ -74,6 +68,10 @@
       text-transform: uppercase;
     }
 
+    &.selected {
+      display: none;
+    }
+
     &:last-child {
       border-bottom: 0px;
       @include box-shadow(transparent 0 0 0 0);

data/app/cells/locomotive/content_locale_picker/show.html.haml

@@ -1,7 +1,7 @@
 #content-locale-picker
   %ul
     - @locales.each do |locale|
-      %li{ :'data-locale' => locale }
-        = image_tag "locomotive/icons/flags/#{locale}.png", :class => 'flag'
+      %li{ :'data-locale' => locale, :class => "#{'selected' if @locale == locale}" }
+        = flag_tag(locale)
 
         %span.text= locale

data/app/cells/locomotive/content_locale_picker_cell.rb

@@ -1,14 +1,18 @@
 module Locomotive
   class ContentLocalePickerCell < Cell::Base
 
+    helper do
+      include ::Locomotive::BaseHelper
+    end
+
     def show(args)
       site    = args[:site]
-      locale  = args[:locale].to_s
+      @locale = args[:locale].to_s
 
       if site.locales.empty? || site.locales.size < 2
         ''
       else
-        @locales = site.locales - [locale]
+        @locales = site.locales
         render
       end
     end

data/app/cells/locomotive/global_actions_cell.rb

@@ -24,7 +24,7 @@ module Locomotive
         add :switch, :url => '#', :id => 'sites-picker-link'
       end
 
-      add :help, :url => 'http://doc.locomotivecms.com/templates/basics', :class => 'tutorial', :id => 'help'
+      add :help, :url => 'http://doc.locomotivecms.com/templates/basics', :class => 'tutorial', :id => 'help', :target => '_blank'
       add :logout, :url => destroy_locomotive_session_url, :data => { :confirm => t('locomotive.messages.confirm') }, :method => :delete
     end
 

data/app/cells/locomotive/main_menu/show.html.haml

@@ -4,7 +4,7 @@
       %div.left
         %span
       = link_to entry[:url] do
-        %em  
+        %i{ :class => entry[:icon] }
         %span= entry[:label]
       %div.right
         %span

data/app/cells/locomotive/main_menu_cell.rb

@@ -4,8 +4,8 @@ module Locomotive
     protected
 
     def build_list
-      add :contents,  :url => pages_url
-      add :settings,  :url => edit_current_site_url
+      add :contents,  :url => pages_url,							:icon => 'icon-folder-open'
+      add :settings,  :url => edit_current_site_url,	:icon => 'icon-cog'
     end
 
   end

data/app/cells/locomotive/settings_menu_cell.rb

@@ -6,6 +6,7 @@ module Locomotive
     def build_list
       add :site,          :url => edit_current_site_url
       add :theme_assets,  :url => theme_assets_url
+      add :translations,  :url => translations_url
       add :account,       :url => edit_my_account_url
     end
 

data/app/controllers/locomotive/api/accounts_controller.rb

@@ -0,0 +1,70 @@
+module Locomotive
+  module Api
+    class AccountsController < Api::BaseController
+
+      load_and_authorize_resource class: Locomotive::Account
+
+      def index
+        respond_with(@accounts)
+      end
+
+      def show
+        respond_with(@account)
+      end
+
+      def create
+        @account.from_presenter(params[:account])
+        @account.save
+        respond_with(@account)
+      end
+
+      def destroy
+        @account.destroy
+        respond_with(@account)
+      end
+
+      protected
+
+      def self.description
+        {
+          overall: %{Manage the accounts (only if logged as an admin) no matter the site they belong to},
+          actions: {
+            index: {
+              description: %{Return all the accounts},
+              example: {
+                command: %{curl 'http://mysite.com/locomotive/api/accounts.json?auth_token=dtsjkqs1TJrWiSiJt2gg'},
+                response: %(TODO)
+              }
+            },
+            show: {
+              description: %{Return the attributes of an account},
+              response: Locomotive::AccountPresenter.getters_to_hash,
+              example: {
+                command: %{curl 'http://mysite.com/locomotive/api/accounts/4244af4ef0000002.json?auth_token=dtsjkqs1TJrWiSiJt2gg'},
+                response: %(TODO)
+              }
+            },
+            create: {
+              description: %{Create an account},
+              params: Locomotive::AccountPresenter.setters_to_hash,
+              example: {
+                command: %{curl -d '...' 'http://mysite.com/locomotive/api/accounts.json?auth_token=dtsjkqs1TJrWiSiJt2gg'},
+                response: %(TODO)
+              }
+            },
+            destroy: {
+              description: %{Delete an account},
+              example: {
+                command: %{curl -X DELETE 'http://mysite.com/locomotive/api/accounts.json?auth_token=dtsjkqs1TJrWiSiJt2gg'},
+                response: %(TODO)
+              }
+            }
+          }
+        }
+      end
+
+    end
+
+  end
+end
+

data/app/controllers/locomotive/api/base_controller.rb

@@ -41,6 +41,14 @@ module Locomotive
         self.setup_i18n_fallbacks
       end
 
+      def self.cancan_resource_class
+        Locomotive::Api::CanCan::ControllerResource
+      end
+
+      def self.description
+        { overall: 'No documentation', actions: {} }
+      end
+
     end
   end
 end

data/app/controllers/locomotive/api/content_assets_controller.rb

@@ -2,31 +2,29 @@ module Locomotive
   module Api
     class ContentAssetsController < BaseController
 
-      load_and_authorize_resource :class => Locomotive::ContentAsset
+      load_and_authorize_resource class: Locomotive::ContentAsset, through: :current_site
 
       def index
-        @content_assets = current_site.content_assets
         respond_with(@content_assets)
       end
 
       def show
-        @content_asset = current_site.content_assets.find(params[:id])
         respond_with(@content_asset)
       end
 
       def create
-        @content_asset = current_site.content_assets.create(params[:content_asset])
-        respond_with @content_asset, :location => main_app.locomotive_api_content_assets_url
+        @content_asset.from_presenter(params[:content_asset])
+        @content_asset.save
+        respond_with @content_asset, location: main_app.locomotive_api_content_assets_url
       end
 
       def update
-        @content_asset = current_site.content_assets.find(params[:id])
-        @content_asset.update_attributes(params[:content_asset])
-        respond_with @content_asset, :location => main_app.locomotive_api_content_assets_url
+        @content_asset.from_presenter(params[:content_asset])
+        @content_asset.save
+        respond_with @content_asset, location: main_app.locomotive_api_content_assets_url
       end
 
       def destroy
-        @content_asset = current_site.content_assets.find(params[:id])
         @content_asset.destroy
         respond_with @content_asset
       end