alchemy_cms 3.0.0.rc5 → 3.0.0.rc6

data/app/assets/stylesheets/alchemy/jquery-ui.scss

@@ -131,6 +131,8 @@
 
 .ui-widget-content a {
   color: $text-color;
+
+  &:hover { color: #000 }
 }
 
 .ui-widget-header {

data/app/assets/stylesheets/alchemy/notices.scss

@@ -27,6 +27,12 @@ div.message, p.message {
     margin: 16px;
   }
 
+  a {
+    text-decoration: underline;
+
+    &:hover { color: #000 }
+  }
+
   ol {
     margin: 0 0 8px;
     padding-left: 20px;

data/app/assets/stylesheets/alchemy/selects.scss

@@ -197,3 +197,13 @@ select {
     width: 100%;
   }
 }
+
+.select_with_label {
+  margin: 0 3*$default-margin;
+  @include inline-block(top);
+
+  label {
+    @include inline-block;
+    margin-right: 2*$default-margin;
+  }
+}

data/app/assets/stylesheets/alchemy/sitemap.scss

@@ -1,6 +1,6 @@
-div#sort_panel {
+#sort_panel {
   background: $medium-gray;
-  padding: 60px 0 8px 0;
+  padding: 45px 0 8px 0;
   position: fixed;
   top: 27px;
   left: 0;
@@ -9,12 +9,12 @@ div#sort_panel {
   border-bottom: $default-border;
 
   div.info {
-    margin: 8px 8px 8px 104px;
+    margin: 8px 8px 8px 78px;
     width: 720px;
   }
 
-  div.buttons {
-    margin-left: 104px;
+  .buttons {
+    margin-left: 78px;
   }
 }
 
@@ -216,15 +216,13 @@ div.page_infos {
   width: 68px;
 }
 
-#sub_navigation span.page_status_and_name span.page_status {
+#sub_navigation .page_status_and_name .page_status {
   float: none;
-  @include inline-block;
-  position: relative;
-  top: -4px;
+  @include inline-block(-1px);
   margin-left: 2px;
 }
 
-span.page_status {
+.page_status {
   width: 16px;
   height: 16px;
   background-image: image-url('alchemy/icons.png');

data/app/assets/stylesheets/alchemy/toolbar.scss

@@ -1,7 +1,5 @@
 #toolbar {
   z-index: 10;
-  padding: 4px;
-  height: 44px;
   @extend %gradiated-toolbar;
   margin-right: 0px;
   border: $default-border;
@@ -9,7 +7,7 @@
   border-right-style: none;
   position: relative;
 
-  div.button_with_label {
+  .button_with_label {
 
     form {
       margin: 0;
@@ -17,10 +15,6 @@
       line-height: 5px;
 
       select { margin: 0 }
-
-      label {
-        margin-top: $default-margin;
-      }
     }
   }
 
@@ -30,7 +24,7 @@
     padding: 0;
   }
 
-  a.button {
+  .button {
     width: 25px;
     height: 21px;
     text-decoration: none;
@@ -62,7 +56,7 @@
 
   .search_form {
     position: absolute;
-    top: 4px;
+    top: 8px;
     right: 8px;
     text-align: center;
   }
@@ -74,30 +68,38 @@
 
   &.right {
     position: absolute;
-    right: 8px;
-    top: 4px;
+    right: 0;
+    top: 8px;
     margin-left: 8px;
+
+    label {
+      left: auto;
+      right: 50%;
+      margin-left: 0;
+      margin-right: -12px;
+
+      &:before {
+        left: auto;
+        right: 8px;
+      }
+    }
   }
 }
 
 .toolbar_spacer {
   @include inline-block;
-  width: 1px;
-  height: 37px;
-  border-right-style: dotted;
+  width: 0px;
+  height: 29px;
+  border-right-style: solid;
   border-right-width: 1px;
-  margin-right: 2*$default-margin;
+  border-right-color: $default-border-color;
+  margin-right: $default-margin;
   margin-left: $default-margin;
 }
 
 #overlay_toolbar {
   @extend %gradiated-toolbar;
-  border: $default-border;
-  height: 44px;
-  border-top-style: none;
-  border-left-style: none;
-  border-right-style: none;
-  padding: $default-padding;
+  border-bottom: $default-border;
 
   a.button {
     width: 25px;
@@ -117,21 +119,28 @@
     }
   }
 
-  .search_field {
-    width: 225px;
-  }
-
   form {
     float: right;
-    width: 310px;
-    margin-top: 2px;
-    padding: 0 !important;
-    margin-right: 0;
+    margin-right: 8px;
 
     .button {
       position: absolute;
-      top: 2px;
-      right: 4px;
+      top: 4px;
+      right: 8px;
     }
   }
 }
+
+.button_group {
+  position: relative;
+  @include inline-block(top);
+  margin: 0 2*$default-margin;
+
+  &:hover label {
+    display: block;
+  }
+
+  .button_with_label {
+    margin: 0;
+  }
+}

data/app/assets/stylesheets/tinymce/skins/alchemy/skin.min.css.scss

@@ -21,7 +21,7 @@
   line-height: normal;
   font-weight: normal;
   text-align: left;
-  @include box-sizing(content-box);
+  @include box-sizing(border-box);
   direction: ltr;
 }
 
@@ -483,29 +483,18 @@ body .mce-abs-layout-item,.mce-abs-end {
 .mce-tooltip {
   position: absolute;
   padding: 5px;
-  opacity: .8;
-  filter: alpha(opacity=80);
-  zoom: 1;
 }
 
 .mce-tooltip-inner {
   font-size: 11px;
-  background-color: #000;
+  background-color: $dark-gray;
   color: #fff;
   max-width: 200px;
-  padding: 5px 8px 4px 8px;
+  padding: $default-padding 2*$default-padding;
   text-align: center;
   white-space: normal;
-}
-
-.mce-tooltip-inner {
-  @include border-radius($default-border-radius);
-}
-
-.mce-tooltip-inner {
-  -webkit-box-shadow: 0 0 5px #000;
-  -moz-box-shadow: 0 0 5px #000;
-  box-shadow: 0 0 5px #000;
+  @include box-shadow(0 0 4px $default-border-color);
+  @extend %rounded-border;
 }
 
 .mce-tooltip-arrow {
@@ -513,23 +502,23 @@ body .mce-abs-layout-item,.mce-abs-end {
   width: 0;
   height: 0;
   line-height: 0;
-  border: 5px dashed #000;
+  border: 5px solid $dark-gray;
 }
 
 .mce-tooltip-arrow-n {
-  border-bottom-color: #000;
+  border-bottom-color: $dark-gray;
 }
 
 .mce-tooltip-arrow-s {
-  border-top-color: #000;
+  border-top-color: $dark-gray;
 }
 
 .mce-tooltip-arrow-e {
-  border-left-color: #000;
+  border-left-color: $dark-gray;
 }
 
 .mce-tooltip-arrow-w {
-  border-right-color: #000;
+  border-right-color: $dark-gray;
 }
 
 .mce-tooltip-nw,.mce-tooltip-sw {
@@ -990,7 +979,7 @@ i.mce-i-checkbox {
   display: inline-block;
   *display: inline;
   *zoom: 1;
-  padding: 8px;
+  padding: 4px 6px;
   white-space: normal;
 }
 

data/app/controllers/alchemy/admin/base_controller.rb

@@ -13,7 +13,7 @@ module Alchemy
       rescue_from Exception do |exception|
         if exception.is_a? CanCan::AccessDenied
           permission_denied(exception)
-        elsif Rails.env.test?
+        elsif raise_exception?
           raise
         else
           exception_handler(exception)
@@ -151,6 +151,19 @@ module Alchemy
         end.symbolize_keys
       end
 
+      # This method decides if we want to raise an exception or not.
+      #
+      # I.e. in test environment.
+      #
+      def raise_exception?
+        Rails.env.test? || is_page_preview?
+      end
+
+      # Are we currently in the page edit mode page preview.
+      def is_page_preview?
+        controller_path == 'alchemy/admin/pages' && action_name == 'show'
+      end
+
     end
   end
 end

data/app/controllers/alchemy/admin/elements_controller.rb

@@ -44,8 +44,10 @@ module Alchemy
             end
             @element.save
           end
-          if @page.definition['insert_elements_at'] == 'top'
-            @insert_at_top = true
+          if params[:insert_after].present?
+            @element_before = Element.find(params[:insert_after])
+            @element.insert_at(@element_before.position + 1)
+          else
             @element.move_to_top
           end
         end

data/app/controllers/alchemy/admin/layoutpages_controller.rb

@@ -9,6 +9,11 @@ module Alchemy
         @languages = Language.all
       end
 
+      def edit
+        @page = Page.find(params[:id])
+        @page_layouts = PageLayout.layouts_with_own_for_select(@page.page_layout, Language.current.id, true)
+      end
+
     end
   end
 end

data/app/controllers/alchemy/admin/legacy_page_urls_controller.rb

@@ -0,0 +1,39 @@
+module Alchemy
+  class Admin::LegacyPageUrlsController < Alchemy::Admin::ResourcesController
+    before_action :load_page
+
+    def new
+      @legacy_page_url = @page.legacy_urls.build
+    end
+
+    def create
+      @legacy_page_url = @page.legacy_urls.build(legacy_page_url_params)
+      @legacy_page_url.save
+    end
+
+    def update
+      @legacy_page_url = LegacyPageUrl.find(params[:id])
+      if @legacy_page_url.update(legacy_page_url_params)
+        render :update
+      else
+        render :edit
+      end
+    end
+
+    def destroy
+      @legacy_page_url = LegacyPageUrl.find(params[:id])
+      @legacy_page_url.destroy
+    end
+
+    private
+
+    def load_page
+      @page = Page.find(params[:page_id])
+    end
+
+    def legacy_page_url_params
+      params.require(:legacy_page_url).permit(:urlname)
+    end
+
+  end
+end

data/app/controllers/alchemy/admin/pages_controller.rb

@@ -31,9 +31,6 @@ module Alchemy
         # Setting the locale to pages language, so the page content has it's correct translations.
         ::I18n.locale = @page.language_code
         render layout: 'application'
-      rescue Exception => e
-        exception_logger(e)
-        render file: Rails.root.join('public', '500.html'), status: 500, layout: false
       end
 
       def info

data/app/controllers/alchemy/base_controller.rb

@@ -120,10 +120,13 @@ WARN
     def redirect_or_render_notice
       if request.xhr?
         respond_to do |format|
-          format.js { render status: 403 }
-          format.html {
-            render(partial: 'alchemy/admin/partials/flash', locals: {message: _t('You are not authorized'), flash_type: 'warning'})
-          }
+          format.js do
+            render text: flash.discard(:warning), status: 403
+          end
+          format.html do
+            render partial: 'alchemy/admin/partials/flash',
+              locals: {message: flash[:warning], flash_type: 'warning'}
+          end
         end
       else
         redirect_to(alchemy.admin_dashboard_path)

data/app/helpers/alchemy/admin/base_helper.rb

@@ -14,6 +14,18 @@ module Alchemy
       include Alchemy::BaseHelper
       include Alchemy::Admin::NavigationHelper
 
+      # Returns a string showing the name of the currently logged in user.
+      #
+      # In order to represent your own +User+'s class instance,
+      # you should add a +alchemy_display_name+ method to your +User+ class
+      #
+      def current_alchemy_user_name
+        name = current_alchemy_user.try(:alchemy_display_name)
+        if name.present?
+          content_tag :span, "#{_t('Logged in as')} #{name}", class: 'current-user-name'
+        end
+      end
+
       # This helper renders the link to an dialog.
       #
       # We use this for our fancy modal dialogs in the Alchemy cockpit.
@@ -22,6 +34,12 @@ module Alchemy
       #
       #   <%= link_to_dialog('Edit', edit_product_path, {size: '200x300'}, {class: 'icon_button'}) %>
       #
+      # Or you call it with a block
+      #
+      #   <%= link_to_dialog edit_product_path, {size: 200x300} do %>
+      #     <%= render_icon(:edit) %>
+      #   <% end %>
+      #
       # @param [String] content
       #   The string inside the link tag
       # @param [String or Hash] url
@@ -38,11 +56,18 @@ module Alchemy
       # @option options [Boolean] :modal (true)
       #    Show as modal window.
       #
-      def link_to_dialog(content, url, options={}, html_options={})
+      def link_to_dialog(content = nil, url = nil, options = {}, html_options = {}, &block)
+        html_options, options, url, content = options, url, content, block if block_given?
         default_options = {modal: true}
         options = default_options.merge(options)
-        link_to content, url,
-          html_options.merge('data-alchemy-dialog' => options.to_json)
+        if block_given?
+          link_to url,
+            html_options.merge('data-alchemy-dialog' => options.to_json),
+            &block
+        else
+          link_to content, url,
+            html_options.merge('data-alchemy-dialog' => options.to_json)
+        end
       end
 
       # Used for translations selector in Alchemy cockpit user settings.
@@ -424,6 +449,11 @@ module Alchemy
         end
       end
 
+      # Returns the regular expression used for external url validation in link dialog.
+      def link_url_regexp
+        Alchemy::Config.get(:format_matchers)['link_url'] || /^(mailto:|\/|[a-z]+:\/\/)/
+      end
+
       private
 
       def permission_from_options(options)