Merge pull request #2734 from refinery/left-side-tabs

Left side tabs
refinery · Jan 16, 2015 · e748c5b · e748c5b
2 parents 2c5e9aa + aee45e1
commit e748c5b
Show file tree

Hide file tree

Showing 16 changed files with 220 additions and 1,117 deletions.
diff --git a/authentication/app/views/refinery/layouts/login.html.erb b/authentication/app/views/refinery/layouts/login.html.erb
@@ -3,16 +3,18 @@
   <%= render '/refinery/admin/head' %>
   <body class='login <%= I18n.locale %>'>
     <div id='tooltip_container'></div>
-    <header>
-      <h1><%= yield :header %></h1>
-    </header>
-    <div id="page_container">
-      <div id="page">
-        <div id="content" class="clearfix">
-          <div id="flash_container">
-            <%= render '/refinery/message' %>
+    <div id="login_container" class="clearfix">
+      <header>
+        <h1><%= yield :header %></h1>
+      </header>
+      <div id="page_container">
+        <div id="page">
+          <div id="content" class="clearfix">
+            <div id="flash_container">
+              <%= render '/refinery/message' %>
+            </div>
+            <%= yield %>
           </div>
-          <%= yield %>
         </div>
       </div>
     </div>

diff --git a/changelog.md b/changelog.md
@@ -11,6 +11,7 @@
 * Removed special 'Refinery Translator' role, introduced in 0.9.22, from the core. [#2730](https://github.com/refinery/refinerycms/pull/2730). [Philip Arndt](https://github.com/parndt)
 * Enabled XHR paging by default, no configuration is needed. [#2733](https://github.com/refinery/refinerycms/pull/2733). [Philip Arndt](https://github.com/parndt)
 * Limited the jquery-ui assets loaded in the backend to the ones we use in the core. [#2735](https://github.com/refinery/refinerycms/pull/2735). [Philip Arndt](https://github.com/parndt)
+* Moved the tabs to the left hand side of the screen. [#2734](https://github.com/refinery/refinerycms/pull/2734). [Isaac Freeman](https://github.com/isaacfreeman) & [Philip Arndt](https://github.com/parndt) & [Brice Sanchez](https://github.com/bricesanchez)
 
 * [See full list](https://github.com/refinery/refinerycms/compare/2-1-stable...master)
 

diff --git a/core/app/assets/images/refinery/carousel-left.png b/core/app/assets/images/refinery/carousel-left.png
diff --git a/core/app/assets/images/refinery/carousel-right.png b/core/app/assets/images/refinery/carousel-right.png
diff --git a/core/app/assets/images/refinery/icons/arrow_left_right.png b/core/app/assets/images/refinery/icons/arrow_left_right.png
diff --git a/core/app/assets/images/refinery/icons/arrow_up_down.png b/core/app/assets/images/refinery/icons/arrow_up_down.png
diff --git a/core/app/assets/javascripts/refinery/interface.js.coffee.erb b/core/app/assets/javascripts/refinery/interface.js.coffee.erb
@@ -5,15 +5,6 @@
   if typeof(visual_editor_init_interface_hook) != 'undefined'
     visual_editor_init_interface_hook()
 
-  if ($menu = $("#menu")).length > 0
-    $menu.jcarousel
-      vertical: false
-      scroll: 1
-      buttonNextHTML: "<img src='<%= asset_path 'refinery/carousel-right.png' %>' alt='down' height='15' width='10' />"
-      buttonPrevHTML: "<img src='<%= asset_path 'refinery/carousel-left.png' %>' alt='up' height='15' width='10' />"
-      listTag: $menu.get(0).tagName.toLowerCase()
-      itemTag: $menu.children(":first").get(0).tagName.toLowerCase()
-
   $("#current_locale li a").click (e) ->
     $("#current_locale li a span.action").each (span) ->
       $(this).css "display", (if $(this).css("display") == "none" then "" else "none")

diff --git a/core/app/assets/javascripts/refinery/refinery.js.erb b/core/app/assets/javascripts/refinery/refinery.js.erb
@@ -7,7 +7,6 @@
  *= require modernizr-min
  *= require jquery/jquery.html5-placeholder-shim
  *= require jquery/jquery.timers
- *= require jquery/jquery.jcarousel
  *= require jquery/jquery.browser
  *= require admin
  *= require refinery/core

diff --git a/core/app/assets/javascripts/refinery/sortable_menu.js.coffee.erb b/core/app/assets/javascripts/refinery/sortable_menu.js.coffee.erb
@@ -3,7 +3,7 @@
   return  if $menu.length == 0
   $menu.sortable(
     items: "> *:not(#menu_reorder, #menu_reorder_done)"
-    axis: "x"
+    axis: "y"
     cursor: "crosshair"
     connectWith: ".nested"
     update: ->

diff --git a/core/app/assets/stylesheets/refinery/_mixins.css.scss b/core/app/assets/stylesheets/refinery/_mixins.css.scss
@@ -0,0 +1,77 @@
+@mixin rounded($radius) {
+  border-radius: $radius;
+  -moz-border-radius: $radius;
+  -webkit-border-radius: $radius;
+}
+@mixin top-rounded($radius) {
+  border-radius-top: $radius;
+  -moz-border-radius-topleft: $radius;
+  -moz-border-radius-topright: $radius;
+  -webkit-border-top-left-radius: $radius;
+  -webkit-border-top-right-radius: $radius;
+}
+@mixin right-rounded($radius) {
+  border-radius-right: $radius;
+  -moz-border-radius-topright: $radius;
+  -moz-border-radius-bottomright: $radius;
+  -webkit-border-top-right-radius: $radius;
+  -webkit-border-bottom-right-radius: $radius;
+}
+@mixin left-rounded($radius) {
+  border-radius-left: $radius;
+  -moz-border-radius-topleft: $radius;
+  -moz-border-radius-bottomleft: $radius;
+  -webkit-border-top-left-radius: $radius;
+  -webkit-border-bottom-left-radius: $radius;
+}
+@mixin bottom-rounded($radius) {
+  border-radius-bottom: $radius;
+  -moz-border-radius-bottomleft: $radius;
+  -moz-border-radius-bottomright: $radius;
+  -webkit-border-bottom-left-radius: $radius;
+  -webkit-border-bottom-right-radius: $radius;
+}
+@mixin box-sizing($box-model) {
+  -webkit-box-sizing: $box-model; // Safari <= 5
+     -moz-box-sizing: $box-model; // Firefox <= 19
+          box-sizing: $box-model;
+}
+@mixin faux_columns_2($col1_width, $col1_bg, $col2_bg) {
+  background-image: -webkit-gradient(
+    linear,
+    left top,
+    right top,
+    color-stop(0, $col1_bg),
+    color-stop($col1_width, $col1_bg),
+    color-stop($col1_width, $col2_bg),
+    color-stop(100%, $col2_bg)
+  );
+  background-image: -webkit-linear-gradient(
+    left,
+    $col1_bg,
+    $col1_bg $col1_width,
+    $col2_bg $col1_width,
+    $col2_bg 100%
+  );
+  background-image: -moz-linear-gradient(
+    left,
+    $col1_bg,
+    $col1_bg $col1_width,
+    $col2_bg $col1_width,
+    $col2_bg 100%
+  );
+  background-image: -ms-linear-gradient(
+    left,
+    $col1_bg,
+    $col1_bg $col1_width,
+    $col2_bg $col1_width,
+    $col2_bg 100%
+  );
+  background-image: -o-linear-gradient(
+    left,
+    $col1_bg,
+    $col1_bg $col1_width,
+    $col2_bg $col1_width,
+    $col2_bg 100%
+  );
+}