Fix nav position on pages that don't use jquery.twoup

bloopletech · Feb 15, 2013 · 0df6b45 · 0df6b45
1 parent 13f7828
commit 0df6b45
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 22 deletions.
diff --git a/app/views/layouts/application.html.haml b/app/views/layouts/application.html.haml
@@ -1,11 +1,8 @@
 !!! 5
-%html.main{ :xmlns => "", :id => "#{@page_id || "#{controller.controller_name}-#{controller.action_name}"}" }
+%html.main{ :xmlns => "", :id => "#{@page_id || "#{controller.controller_name}-#{controller.action_name}"}", "class" => @page_style }
   %head
     = render :partial => 'layouts/header'
-    - if @page_style == "manipulate"
-      = include_stylesheets :manipulate, :media => "all"
-    - else
-      = include_javascripts :application
+    = include_javascripts :application
   %body
     #wrapper
       - if flash[:success]

diff --git a/public/javascripts/application.js b/public/javascripts/application.js
@@ -1,9 +1,11 @@
 $(function() {
-  $("#wrapper").twoup("1px solid silver");
-  $(window).resize(function() {
-    $.twoup.content.css("position", "relative");
-    $("#nav-wrapper").css("left", ($.twoup.column_width() - $("#nav-wrapper").width()) + "px");
-  }).resize();
+  if(!$("html").hasClass("manipulate")) {
+    $("#wrapper").twoup("1px solid silver");
+    $(window).resize(function() {
+      $.twoup.content.css("position", "relative");
+      $("#nav-wrapper").css("left", ($.twoup.column_width() - $("#nav-wrapper").width()) + "px");
+    }).resize();
+  }
 
   /*setTimeout(function() {
     scrollTo(200, 0);

diff --git a/public/stylesheets/manipulate.css b/public/stylesheets/manipulate.css
diff --git a/public/stylesheets/style.css b/public/stylesheets/style.css
@@ -47,6 +47,11 @@ h3 { font-size: 18px; margin-bottom: 0.6em; text-align: left; font-weight: bold;
  z-index: 1000;
 }
 
+html.manipulate #nav-wrapper {
+  right: 20px;
+  top: 20px;
+}
+
 #nav-wrapper:hover > #nav { display: block; }
 
 #nav {