re-working the pages to look right with the new selectors

HamptonMakes · Dec 16, 2009 · 43a732c · 43a732c
1 parent f1f92e4
commit 43a732c
Show file tree

Hide file tree

Showing 6 changed files with 11 additions and 6 deletions.
diff --git a/app/controllers/information.rb b/app/controllers/information.rb
@@ -5,6 +5,7 @@ def donate
     params[:footmenu] = "false"
     render
   end
+
   def disable
     @title = ""
     @path = params[:title] || ""

diff --git a/app/views/articles/home.html.haml b/app/views/articles/home.html.haml
@@ -2,9 +2,9 @@
 
 - if @main_page
   #main_box
-    - if @main_page["article_of_the_day"]
+    - if @main_page["featured_article"]
       %h2= language_object["featured_article"]
-      #featured_article= @main_page["article_of_the_day"]
+      #featured_article= @main_page["featured_article"]
 
     - if @main_page["news_items"]
       .today

diff --git a/app/views/articles/home.json.haml b/app/views/articles/home.json.haml
@@ -1,9 +1,9 @@
 = language_notice if !supported_language?
 
 #main_page
-  - if @main_page["article_of_the_day"]
+  - if @main_page["featured_article"]
     %h2= language_object["featured_article"]
-    #featured_article= @main_page["article_of_the_day"]
+    #featured_article= @main_page["featured_article"]
 
   - if @main_page["news_items"]
     .today

diff --git a/app/views/layout/application.html.haml b/app/views/layout/application.html.haml
@@ -16,7 +16,7 @@
   %body
     - if (params['searchBar'] || "") != "false"
       = partial("layout/search_".force_encoding("UTF-8") + request.device.search_bar) if request.device.search_bar
-    #content_wrapper{:class => request.action_name}
+    #content_wrapper{:class => [request.action_name, current_wiki]}
       = catch_content :for_layout
     #footer
       - if params['footmenu'] != "false"

diff --git a/config/nginx.site.conf b/config/nginx.site.conf
@@ -49,6 +49,10 @@ server {
 
   # doc root
   root /srv/mobile/current/public;
+
+  location /config {
+    root /srv/mobile/current/config
+  }
 
   location / {
     # needed to forward user's IP address to rails

diff --git a/public/stylesheets/sass/default.sass b/public/stylesheets/sass/default.sass
@@ -96,4 +96,4 @@ span.citation:target, cite:target
 .content_block,
 .section_anchors,
 button.section_heading.hide
-  display: none
+  display: none