Merge pull request #407 from linuxfrorg/projets_libres

Projets Libres in nav bar + decorated links

Author: Oumph

app/assets/stylesheets/contrib/RonRonnement-Classic.scss

@@ -1016,6 +1016,13 @@ footer.actions {
       border-image: url("/favicon.png") 0 0 0 32;
       border-style: solid;
     }
+    &[href^="https://www.projets-libres.org"],
+    &[href^="https://projets-libres.org"] {
+      padding-left: 3px;
+      border-left: 16px;
+      border-image: url("/projets_libres.png") 0 0 0 32;
+      border-style: solid;
+    }
   }
   ul,
   ol {

app/assets/stylesheets/parts/content.scss

@@ -265,6 +265,13 @@ footer.actions {
       border-image: url("/favicon.png") 0 0 0 32;
       border-style: solid;
     }
+    &[href^="https://www.projets-libres.org"],
+    &[href^="https://projets-libres.org"] {
+      padding-left: 3px;
+      border-left: 16px;
+      border-image: url("/projets_libres.png") 0 0 0 32;
+      border-style: solid;
+    }
   }
   ul,
   ol {

app/assets/stylesheets/parts/top_menu.scss

@@ -58,16 +58,14 @@
       width: 125px;
     }
     input#search_submit {
+      background-image: none;
       background: no-repeat 0 transparent;
-      background-size: 22px;
-      background-image: url("/images/icones/glass.png");
-      background-image: url("/images/icones/glass.svg"), none;
-      text-indent: -9998em;
       border: none;
-      width: 22px;
-      height: 22px;
+      text-indent: 0em;
+      padding-left: 0;
       padding-right: 0;
-      cursor: pointer;
+      content: "🔎";
+      text-align: left;
     }
   }
 }

app/views/layouts/_site.html.haml

@@ -9,10 +9,10 @@
     %li{class: ("active" if controller_name == "diaries" || (controller_name == "users" && action_name == "show"))}= link_to "Journaux", '/journaux', title: "Journaux personnels de nos visiteurs"
     %li{class: ("active" if controller_name == "bookmarks" || (controller_name == "users" && action_name == "show"))}= link_to "Liens", '/liens', title: "Liens remarquables"
     %li{class: ("active" if controller_name == "forums" || controller_name == "posts")}= link_to "Forums", '/forums', title: "Questions‑réponses, petites annonces"
-    %li{class: ("active" if controller_name == "wiki_pages" || controller_name == "wiki_versions")}= link_to "Wiki", '/wiki', title: "Pages wiki"
     %li{class: ("active" if current_page?("/redaction"))}= link_to "Rédaction", '/redaction', title: "Participez à la rédaction des dépêches"
+    %li= link_to "🎙️ Projets Libres", 'https://www.projets-libres.org/', title: "Podcast/baladodiffusion Projets Libres", id: "podcast"
   = form_tag '/recherche', method: :get do
     .searchbox(role="search")
       <label for="query" id="label_query">Recherche :</label>
       <input id="query" name="q" type="search" placeholder="Rechercher" />
-      = submit_tag "Rechercher", name: nil, id: "search_submit", title: "Lancer la recherche sur le site"
+      = submit_tag "🔎", name: nil, id: "search_submit", title: "Lancer la recherche sur le site"