From 14fbd7b2052a69a45382f2d640213b5008a2fc23 Mon Sep 17 00:00:00 2001
From: Pablo Cuadrado <pablocuadrado@gmail.com>
Date: Tue, 1 Jul 2014 05:56:49 -0300
Subject: [PATCH 1/2] help page ported to bootstrap

---
 app/assets/stylesheets/help.css.scss          |  18 ++-
 app/assets/stylesheets/new-templates.css.scss |   3 +
 app/assets/stylesheets/new_styles/_base.scss  |   5 +
 app/assets/templates/help_tpl.jst.hbs         | 138 +++++++++---------
 app/controllers/help_controller.rb            |   2 +
 5 files changed, 99 insertions(+), 67 deletions(-)

diff --git a/app/assets/stylesheets/help.css.scss b/app/assets/stylesheets/help.css.scss
index b0e03aceb..ca4edf9ed 100644
--- a/app/assets/stylesheets/help.css.scss
+++ b/app/assets/stylesheets/help.css.scss
@@ -1,3 +1,9 @@
+h2.help_header {
+  border-bottom: 1px solid black;
+  padding-bottom: 5px;
+  margin-bottom: 15px;
+}
+
 ul#help_nav {
   display: inline;
   padding: 0;
@@ -23,13 +29,18 @@ ul#help_nav {
     font-weight: 700;
   }
   ul {
+    list-style: none;
     padding: 0;
+    margin: 0;
     li {
       font-weight: 700;
       margin-bottom: 10px;
       a {
         font-weight: normal;
       }
+      .section-selected {
+        font-weight: bold;
+      }
     }
   }
 }
@@ -55,7 +66,10 @@ ul#help_nav {
     background-color: rgb(242, 242, 242);
     margin-bottom: 10px;
     @include border-radius(4px);
-    a.toggle { text-decoration: none; }
+    a.toggle {
+      text-decoration: none; 
+      color: black;
+    }
     h4 { 
       text-align: left;
       font-weight: 700;
@@ -74,7 +88,7 @@ ul#help_nav {
       }
     }
     .answer {
-      @include border-bottom-radius(4px);
+      @include border-radius(0px, 0px, 4px, 4px);
       background-color: white;
       padding: 10px 20px;
     }
diff --git a/app/assets/stylesheets/new-templates.css.scss b/app/assets/stylesheets/new-templates.css.scss
index cfc3795e4..1fb110ba3 100644
--- a/app/assets/stylesheets/new-templates.css.scss
+++ b/app/assets/stylesheets/new-templates.css.scss
@@ -42,3 +42,6 @@
 
 /* notifications */
 @import 'notifications';
+
+/* help */
+@import 'help';
diff --git a/app/assets/stylesheets/new_styles/_base.scss b/app/assets/stylesheets/new_styles/_base.scss
index cdf719030..93ae671ba 100644
--- a/app/assets/stylesheets/new_styles/_base.scss
+++ b/app/assets/stylesheets/new_styles/_base.scss
@@ -146,6 +146,11 @@ $bring-dark-accent-forward-color: #DDD;
   }
 }
 
+/* padder helper to push content below the header, to be removed when porting to bootstrap is complete */
+.bootstrap_header_padding {
+  padding-top: 40px;
+}
+
 /* responsive */
 @media (max-width: 767px) {
   body {
diff --git a/app/assets/templates/help_tpl.jst.hbs b/app/assets/templates/help_tpl.jst.hbs
index 42864cea2..23b878310 100644
--- a/app/assets/templates/help_tpl.jst.hbs
+++ b/app/assets/templates/help_tpl.jst.hbs
@@ -1,69 +1,77 @@
 
-<div id="section_header">
-  <h2 class="help_header">Help</h2>
-</div>
-<div class="span-5">
-  <div id='faq_nav'>
-    <ul>
-      <li>
-        <a href="#" class="section-unselected faq-link-getting-help" data-section="getting_help" data-items="">{{ title_getting_help }}</a>
-        <span class="section-selected">{{ title_getting_help }}</span>
-      </li>
-      <li>
-        <a href="#" class="section-unselected faq-link" data-section="account_and_data_management" data-items="move_pods download_data close_account data_visible_to_podmin data_other_podmins">{{ title_account_and_data_management }}</a>
-        <span class="section-selected">{{ title_account_and_data_management }}</span>
-      </li>
-      <li>
-        <a href="#" class="section-unselected faq-link" data-section="aspects" data-items="what_is_an_aspect who_sees_post restrict_posts_i_see contacts_know_aspect contacts_visible remove_notification rename_aspect change_aspect_of_post post_multiple_aspects person_multiple_aspects delete_aspect">{{ title_aspects }}</a>
-        <span class="section-selected">{{ title_aspects }}</span>
-      </li>
-      <li>
-        <a href="#" class="section-unselected faq-link" data-section="mentions" data-items="what_is_a_mention how_to_mention mention_in_comment see_mentions">{{ title_mentions }}</a>
-        <span class="section-selected">{{ title_mentions }}</span>
-      </li>
-      <li>
-        <a href="#" class="section-unselected faq-link" data-section="pods" data-items="what_is_a_pod find_people use_search_box">{{ title_pods }}</a>
-        <span class="section-selected">{{ title_pods }}</span>
-      </li>
-      <li>
-        <a href="#" class="section-unselected faq-link-posts-and-posting" data-section="posts_and_posting" data-items="hide_posts format_text insert_images">{{ title_posts_and_posting }}</a>
-        <span class="section-selected">{{ title_posts_and_posting }}</span>
-      </li>
-      <li>
-        <a href="#" class="section-unselected faq-link" data-section="private_posts" data-items="who_sees_post can_comment can_reshare see_comment">{{ title_private_posts }}</a>
-        <span class="section-selected">{{ title_private_posts }}</span>
-      </li>
-      <li>
-        <a href="#" class="section-unselected faq-link" data-section="private_profiles" data-items="who_sees_profile whats_in_profile who_sees_updates">{{ title_private_profiles }}</a>
-        <span class="section-selected">{{ title_private_profiles }}</span>
-      </li>
-      <li>
-        <a href="#" class="section-unselected faq-link" data-section="public_posts" data-items="who_sees_post find_public_post can_comment_reshare_like see_comment_reshare_like deselect_aspect_posting">{{ title_public_posts }}</a>
-        <span class="section-selected">{{ title_public_posts }}</span>
-      </li>
-      <li>
-        <a href="#" class="section-unselected faq-link" data-section="public_profiles" data-items="who_sees_profile whats_in_profile who_sees_updates what_do_tags_do">{{ title_public_profiles }}</a>
-        <span class="section-selected">{{ title_public_profiles }}</span>
-      </li>
-      <li>
-        <a href="#" class="section-unselected faq-link" data-section="resharing_posts" data-items="reshare_public_post_aspects reshare_private_post_aspects">{{ title_resharing_posts }}</a>
-        <span class="section-selected">{{ title_resharing_posts }}</span>
-      </li>
-      <li>
-        <a href="#" class="section-unselected faq-link-sharing" data-section="sharing" data-items="">{{ title_sharing }}</a>
-        <span class="section-selected">{{ title_sharing }}</span>
-      </li>
-      <li>
-        <a href="#" class="section-unselected faq-link" data-section="tags" data-items="what_are_tags_for tags_in_comments followed_tags people_tag_page filter_tags">{{ title_tags }}</a>
-        <span class="section-selected">{{ title_tags }}</span>
-      </li>
-      <li>
-        <a href="#" class="section-unselected faq-link" data-section="miscellaneous" data-items="back_to_top photo_albums subscribe_feed diaspora_app">{{ title_miscellaneous }}</a>
-        <span class="section-selected">{{ title_miscellaneous }}</span>
-      </li>
-    </ul>
+<div class="bootstrap_header_padding"></div>
+
+<div class="container">
+
+  <div id="section_header">
+    <h2 class="help_header">Help</h2>
   </div>
-</div>
 
-<div class="span-19 last" id=faq>
+  <div class="row-fluid">
+    <div class="span3">
+      <div id='faq_nav'>
+        <ul>
+          <li>
+            <a href="#" class="section-unselected faq-link-getting-help" data-section="getting_help" data-items="">{{ title_getting_help }}</a>
+            <span class="section-selected">{{ title_getting_help }}</span>
+          </li>
+          <li>
+            <a href="#" class="section-unselected faq-link" data-section="account_and_data_management" data-items="move_pods download_data close_account data_visible_to_podmin data_other_podmins">{{ title_account_and_data_management }}</a>
+            <span class="section-selected">{{ title_account_and_data_management }}</span>
+          </li>
+          <li>
+            <a href="#" class="section-unselected faq-link" data-section="aspects" data-items="what_is_an_aspect who_sees_post restrict_posts_i_see contacts_know_aspect contacts_visible remove_notification rename_aspect change_aspect_of_post post_multiple_aspects person_multiple_aspects delete_aspect">{{ title_aspects }}</a>
+            <span class="section-selected">{{ title_aspects }}</span>
+          </li>
+          <li>
+            <a href="#" class="section-unselected faq-link" data-section="mentions" data-items="what_is_a_mention how_to_mention mention_in_comment see_mentions">{{ title_mentions }}</a>
+            <span class="section-selected">{{ title_mentions }}</span>
+          </li>
+          <li>
+            <a href="#" class="section-unselected faq-link" data-section="pods" data-items="what_is_a_pod find_people use_search_box">{{ title_pods }}</a>
+            <span class="section-selected">{{ title_pods }}</span>
+          </li>
+          <li>
+            <a href="#" class="section-unselected faq-link-posts-and-posting" data-section="posts_and_posting" data-items="hide_posts format_text insert_images">{{ title_posts_and_posting }}</a>
+            <span class="section-selected">{{ title_posts_and_posting }}</span>
+          </li>
+          <li>
+            <a href="#" class="section-unselected faq-link" data-section="private_posts" data-items="who_sees_post can_comment can_reshare see_comment">{{ title_private_posts }}</a>
+            <span class="section-selected">{{ title_private_posts }}</span>
+          </li>
+          <li>
+            <a href="#" class="section-unselected faq-link" data-section="private_profiles" data-items="who_sees_profile whats_in_profile who_sees_updates">{{ title_private_profiles }}</a>
+            <span class="section-selected">{{ title_private_profiles }}</span>
+          </li>
+          <li>
+            <a href="#" class="section-unselected faq-link" data-section="public_posts" data-items="who_sees_post find_public_post can_comment_reshare_like see_comment_reshare_like deselect_aspect_posting">{{ title_public_posts }}</a>
+            <span class="section-selected">{{ title_public_posts }}</span>
+          </li>
+          <li>
+            <a href="#" class="section-unselected faq-link" data-section="public_profiles" data-items="who_sees_profile whats_in_profile who_sees_updates what_do_tags_do">{{ title_public_profiles }}</a>
+            <span class="section-selected">{{ title_public_profiles }}</span>
+          </li>
+          <li>
+            <a href="#" class="section-unselected faq-link" data-section="resharing_posts" data-items="reshare_public_post_aspects reshare_private_post_aspects">{{ title_resharing_posts }}</a>
+            <span class="section-selected">{{ title_resharing_posts }}</span>
+          </li>
+          <li>
+            <a href="#" class="section-unselected faq-link-sharing" data-section="sharing" data-items="">{{ title_sharing }}</a>
+            <span class="section-selected">{{ title_sharing }}</span>
+          </li>
+          <li>
+            <a href="#" class="section-unselected faq-link" data-section="tags" data-items="what_are_tags_for tags_in_comments followed_tags people_tag_page filter_tags">{{ title_tags }}</a>
+            <span class="section-selected">{{ title_tags }}</span>
+          </li>
+          <li>
+            <a href="#" class="section-unselected faq-link" data-section="miscellaneous" data-items="back_to_top photo_albums subscribe_feed diaspora_app">{{ title_miscellaneous }}</a>
+            <span class="section-selected">{{ title_miscellaneous }}</span>
+          </li>
+        </ul>
+      </div>
+    </div>
+
+    <div class="span9 last" id=faq>
+    </div>
+  </div>
 </div>
\ No newline at end of file
diff --git a/app/controllers/help_controller.rb b/app/controllers/help_controller.rb
index 4799488ae..0e3e05f6e 100644
--- a/app/controllers/help_controller.rb
+++ b/app/controllers/help_controller.rb
@@ -1,2 +1,4 @@
 class HelpController < ApplicationController
+	before_filter -> { @css_framework = :bootstrap }
+	layout ->(c) { request.format == :mobile ? "application" : "with_header_with_footer" }
 end

From 45d04a44eaf2069e09621f123cb18efdb11c7707 Mon Sep 17 00:00:00 2001
From: Pablo Cuadrado <pablocuadrado@gmail.com>
Date: Tue, 1 Jul 2014 06:19:29 -0300
Subject: [PATCH 2/2] added title_header key for the Help header, only for EN
 lang so far

---
 app/assets/javascripts/app/views/help_view.js | 1 +
 app/assets/templates/help_tpl.jst.hbs         | 2 +-
 config/locales/diaspora/en.yml                | 1 +
 3 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/app/assets/javascripts/app/views/help_view.js b/app/assets/javascripts/app/views/help_view.js
index 646e4dc58..b46d2209f 100644
--- a/app/assets/javascripts/app/views/help_view.js
+++ b/app/assets/javascripts/app/views/help_view.js
@@ -26,6 +26,7 @@ app.views.Help = app.views.StaticContentView.extend({
     };
 
     this.data = {
+      title_header: Diaspora.I18n.t( 'title_header' ),
       title_getting_help: Diaspora.I18n.t( 'getting_help.title' ),
       title_account_and_data_management: Diaspora.I18n.t( 'account_and_data_management.title' ),
       title_aspects: Diaspora.I18n.t( 'aspects.title' ),
diff --git a/app/assets/templates/help_tpl.jst.hbs b/app/assets/templates/help_tpl.jst.hbs
index 23b878310..5048b0d43 100644
--- a/app/assets/templates/help_tpl.jst.hbs
+++ b/app/assets/templates/help_tpl.jst.hbs
@@ -4,7 +4,7 @@
 <div class="container">
 
   <div id="section_header">
-    <h2 class="help_header">Help</h2>
+    <h2 class="help_header">{{ title_header }}</h2>
   </div>
 
   <div class="row-fluid">
diff --git a/config/locales/diaspora/en.yml b/config/locales/diaspora/en.yml
index 44ac3630e..2ec315cfa 100644
--- a/config/locales/diaspora/en.yml
+++ b/config/locales/diaspora/en.yml
@@ -374,6 +374,7 @@ en:
       birthday_with_year: "%B %d %Y"
 
   help:
+    title_header: "Help"
     tutorials: "tutorials"
     tutorial: "tutorial"
     irc: "IRC"