Merge branch 'develop'

29 files changed, 62 insertions, 277 deletions

diff --git a/app/assets/images/icon_application_octet-stream_large.png b/app/assets/images/content_type/icon_application_octet-stream_large.png
index 02347f1..02347f1 100644
--- a/app/assets/images/icon_application_octet-stream_large.png
+++ b/app/assets/images/content_type/icon_application_octet-stream_large.png
diff --git a/app/assets/images/icon_application_pdf_large.png b/app/assets/images/content_type/icon_application_pdf_large.png
index 1374851..1374851 100644
--- a/app/assets/images/icon_application_pdf_large.png
+++ b/app/assets/images/content_type/icon_application_pdf_large.png
diff --git a/app/assets/images/icon_application_rtf_large.png b/app/assets/images/content_type/icon_application_rtf_large.png
index fbed2e9..fbed2e9 100644
--- a/app/assets/images/icon_application_rtf_large.png
+++ b/app/assets/images/content_type/icon_application_rtf_large.png
diff --git a/app/assets/images/icon_application_vnd.ms-excel_large.png b/app/assets/images/content_type/icon_application_vnd.ms-excel_large.png
index 86e1ee4..86e1ee4 100644
--- a/app/assets/images/icon_application_vnd.ms-excel_large.png
+++ b/app/assets/images/content_type/icon_application_vnd.ms-excel_large.png
diff --git a/app/assets/images/icon_application_vnd.ms-powerpoint_large.png b/app/assets/images/content_type/icon_application_vnd.ms-powerpoint_large.png
index 6374b3b..6374b3b 100644
--- a/app/assets/images/icon_application_vnd.ms-powerpoint_large.png
+++ b/app/assets/images/content_type/icon_application_vnd.ms-powerpoint_large.png
diff --git a/app/assets/images/icon_application_vnd.ms-word_large.png b/app/assets/images/content_type/icon_application_vnd.ms-word_large.png
index 5a2916a..5a2916a 100644
--- a/app/assets/images/icon_application_vnd.ms-word_large.png
+++ b/app/assets/images/content_type/icon_application_vnd.ms-word_large.png
diff --git a/app/assets/images/icon_application_zip_large.png b/app/assets/images/content_type/icon_application_zip_large.png
index 042d8c7..042d8c7 100644
--- a/app/assets/images/icon_application_zip_large.png
+++ b/app/assets/images/content_type/icon_application_zip_large.png
diff --git a/app/assets/images/icon_image_bmp_large.png b/app/assets/images/content_type/icon_image_bmp_large.png
index 347bdaa..347bdaa 120000
--- a/app/assets/images/icon_image_bmp_large.png
+++ b/app/assets/images/content_type/icon_image_bmp_large.png
diff --git a/app/assets/images/icon_image_gif_large.png b/app/assets/images/content_type/icon_image_gif_large.png
index 347bdaa..347bdaa 120000
--- a/app/assets/images/icon_image_gif_large.png
+++ b/app/assets/images/content_type/icon_image_gif_large.png
diff --git a/app/assets/images/icon_image_img_large.png b/app/assets/images/content_type/icon_image_img_large.png
index 06e263d..06e263d 100644
--- a/app/assets/images/icon_image_img_large.png
+++ b/app/assets/images/content_type/icon_image_img_large.png
diff --git a/app/assets/images/icon_image_jpeg_large.png b/app/assets/images/content_type/icon_image_jpeg_large.png
index 347bdaa..347bdaa 120000
--- a/app/assets/images/icon_image_jpeg_large.png
+++ b/app/assets/images/content_type/icon_image_jpeg_large.png
diff --git a/app/assets/images/icon_image_png_large.png b/app/assets/images/content_type/icon_image_png_large.png
index 347bdaa..347bdaa 120000
--- a/app/assets/images/icon_image_png_large.png
+++ b/app/assets/images/content_type/icon_image_png_large.png
diff --git a/app/assets/images/icon_image_tiff_large.png b/app/assets/images/content_type/icon_image_tiff_large.png
index be2029a..be2029a 100644
--- a/app/assets/images/icon_image_tiff_large.png
+++ b/app/assets/images/content_type/icon_image_tiff_large.png
diff --git a/app/assets/images/icon_message_delivery-status_large.png b/app/assets/images/content_type/icon_message_delivery-status_large.png
index 8a895bc..8a895bc 100644
--- a/app/assets/images/icon_message_delivery-status_large.png
+++ b/app/assets/images/content_type/icon_message_delivery-status_large.png
diff --git a/app/assets/images/icon_text_html_large.png b/app/assets/images/content_type/icon_text_html_large.png
index f772ea3..f772ea3 100644
--- a/app/assets/images/icon_text_html_large.png
+++ b/app/assets/images/content_type/icon_text_html_large.png
diff --git a/app/assets/images/icon_text_plain_large.png b/app/assets/images/content_type/icon_text_plain_large.png
index fe31dc4..fe31dc4 100644
--- a/app/assets/images/icon_text_plain_large.png
+++ b/app/assets/images/content_type/icon_text_plain_large.png
diff --git a/app/assets/images/icon_text_x-vcard_large.png b/app/assets/images/content_type/icon_text_x-vcard_large.png
index 112ffb1..112ffb1 100644
--- a/app/assets/images/icon_text_x-vcard_large.png
+++ b/app/assets/images/content_type/icon_text_x-vcard_large.png
diff --git a/app/assets/images/icon_unknown.png b/app/assets/images/content_type/icon_unknown.png
index a10dd3d..a10dd3d 100644
--- a/app/assets/images/icon_unknown.png
+++ b/app/assets/images/content_type/icon_unknown.png
diff --git a/app/assets/images/home-grad.png b/app/assets/images/home-grad.png
deleted file mode 100644
index ff9887a..0000000
--- a/app/assets/images/home-grad.png
+++ /dev/null
diff --git a/app/assets/images/locale-switcher.png b/app/assets/images/locale-switcher.png
deleted file mode 100644
index 850cb9a..0000000
--- a/app/assets/images/locale-switcher.png
+++ /dev/null
diff --git a/app/assets/images/old-logo.png b/app/assets/images/old-logo.png
deleted file mode 100644
index 8b88458..0000000
--- a/app/assets/images/old-logo.png
+++ /dev/null
diff --git a/app/assets/images/quote-marks.png b/app/assets/images/quote-marks.png
deleted file mode 100644
index e98f35c..0000000
--- a/app/assets/images/quote-marks.png
+++ /dev/null
diff --git a/app/assets/images/small-green-cross.png b/app/assets/images/small-green-cross.png
deleted file mode 100644
index 96ebac9..0000000
--- a/app/assets/images/small-green-cross.png
+++ /dev/null
diff --git a/app/assets/images/wordpress.png b/app/assets/images/wordpress.png
deleted file mode 100644
index 31955ac..0000000
--- a/app/assets/images/wordpress.png
+++ /dev/null
diff --git a/app/assets/stylesheets/custom.css.scss b/app/assets/stylesheets/custom.css.scss
deleted file mode 100644
index 6ca983e..0000000
--- a/app/assets/stylesheets/custom.css.scss
+++ /dev/null
@@ -1,274 +0,0 @@
-body {
-color:#444;
-font-family:Arial, sans-serif;
-}
-
-#banner {
-background-repeat:no-repeat;
-background-position:center top;
-background-color:#F0F0F0;
-background:image-url('stripes.png');
-}
-
-#topnav {
-font-family:'DeliciousRoman', Arial, sans-serif;
-}
-
-#topnav li a,#topnav li a:visited {
-color:#ADADAD;
-}
-
-#topnav li a:hover {
-color:#fff;
-}
-
-#topnav ul li.selected {
- background:#fff;
-}
-
-#topnav ul li a {
-color:#6B3C6A !important;
-}
-
-#logged_in_bar {
-color:#444;
-}
-
-#logged_in_bar a,#logged_in_bar a:visited {
-color:#92B3FF;
-}
-
-h1,h2,h3 {
- font-family:Trebuchet, Trebuchet MS, Helvetica, sans-serif;
- color:#555;
-}
-
-h1 {
-color:#93278F;
-font-size:42px;
-font-family:'DeliciousBold', Arial, sans-serif;
-}
-
-h2 {
-font-size:1.4em;
-}
-
-
-h2,dt {
-color:#93278F;
-font-family:'DeliciousBold', Arial, sans-serif;
-font-weight:400;
-}
-
-h3 {
-color:#6B3C6A;
-font-family:'DeliciousRoman', Arial, sans-serif;
-font-weight:400;
-}
-
-a {
-color:#93278F;
-}
-
-p.subtitle {
-font-family:'DeliciousRoman';
-color:#6B3C7F;
-}
-
-.request_listing span.head a,.user_listing span.head a,.body_listing span.head a {
-color:#6B3C6A;
-font-family:'DeliciousRoman', Arial, sans-serif;
-font-weight:400;
-}
-
-.request_listing span.desc {
-background:image-url('quote-marks.png') no-repeat;
-color:#444;
-}
-
-.feed_link a,.act_link a,#header_right > a {
-color:#6B3C6A;
-}
-
-#request_form label,label.form_label,span#to_public_body {
-color:#6B3C6A;
-}
-
-span#to_public_body {
-font-family:'DeliciousBold', Arial, sans-serif;
-}
-
-#middle_strip {
-color:#93278F;
-}
-
-#stepwise_make_request {
-background-color:#d0d0d0;
-background:image-url('stripes.png');
-border:1px solid #DEBEDD;
-font-family:'DeliciousRoman', Arial, sans-serif;
-color:#6B3C6A;
-}
-
-div.comment_in_request {
-background:image-url('stripes-70-light2.png');
-border-color:#5F5F5F;
-border-style:dotted;
-border-width:1px;
-}
-
-#request_form label,label.form_label {
-font-family:'DeliciousRoman', Arial, sans-serif;
-}
-
-#navigation_search input[type=text] {
- border-color:#BE7DBC;
-}
-
-
-form input[type=submit],a.link_button_green,a.link_button_green_large {
-font-family:'DeliciousRoman', Arial, sans-serif;
-}
-
-div.frontpage-box {
-background:image-url('stripes.png');
-border:1px solid #DEBEDD;
-font-family:'DeliciousRoman', Arial, sans-serif;
-color:#6B3C6A;
-}
-
-
-div.correspondence,div.comment_in_request {
-background:image-url('stripes-70.png');
-}
-
-div.outgoing.correspondence {
-background:image-url('stripes-70-light.png');
-}
-
-#frontpage_splash {
-background:image-url('flying-computer.png') no-repeat 175px bottom;
-}
-
-#frontpage_splash h1 {
-font-family:'DeliciousRoman', Arial, sans-serif;
-font-size:39px;
-color:#6B3C6A;
-font-weight:400;
-margin:0 0 20px;
-}
-
-#frontpage_splash h1 strong {
-font-family:'DeliciousHeavyRegular', Arial, sans-serif;
-font-size:54px;
-color:#93278F;
-font-weight:400;
-}
-
-#frontpage_splash h1 span {
-font-family:Georgia;
-font-style:italic;
-font-weight:400;
-font-size:25px;
-color:#6B3C6A;
-}
-
-#frontpage_splash h2 {
-font-size:26px;
-font-weight:400;
-color:#6B3C6A;
-font-family:'DeliciousRoman', Arial, sans-serif;
-}
-
-#frontpage_splash h2 strong {
-font-size:31px;
-color:#93278F;
-font-family:'DeliciousBold', Arial, sans-serif;
-}
-
-#frontpage_splash h2 span {
-color:#6B3C6A;
-font-style:italic;
-font-size:19px;
-font-family:Georgia;
-}
-
-
-#ui-datepicker-div.ui-widget {
-font-family:Arial, sans-serif;
-color:#93278F;
-}
-
-#ui-datepicker-div .ui-datepicker-header,#ui-datepicker-div .ui-widget-header {
-color:#93278F;
-font-family:'DeliciousRoman';
-}
-
-#ui-datepicker-div .ui-state-default:hover {
-background:#DEB4D8;
-color:#FFF;
-}
-
-#ui-datepicker-div .ui-state-active {
-background:#D093C7;
-color:#FFF;
-}
-
-#other-country-notice {
-background:#93278F;
-color:#FFF;
-}
-
-p.public-body-name-prefix {
-color:#DEB4D8;
-}
-
-#other-country-notice a {
-color:#FFF;
-}
-
-
-#link_box {
-position:absolute;
-text-align:left;
-background-color:#FFF;
-z-index:999;
-opacity:0.9px;
-border-radius:6px;
--moz-border-radius:6px;
-border:1px solid #93278F;
-display:none;
-padding:5px;
-}
-
-#link_box .close-button {
-background-color:#93278F;
-margin-left:15px;
-padding:0;
-}
-
-div.correspondence p.preview_subject {
-font-family:'DeliciousRoman';
-color:#6B3C7F;
-}
-
-div.correspondence p.preview_subject strong {
-color:#6B3C7F;
-}
-
-div.controller_help h1 a,#logged_in_bar a,#logged_in_bar a:visited,#stepwise_make_request strong {
-color:#93278F;
-}
-
-
-body.front {
-background:image-url('home-grad.png') repeat-x 0 160px;
-}
-
-.request_listing span.desc {
-background:image-url('quote-marks.png') no-repeat;
-}
-
-#frontpage_examples .excerpt {
-background:image-url('quote-marks.png') no-repeat;
-}
diff --git a/app/assets/stylesheets/responsive/custom.scss b/app/assets/stylesheets/responsive/custom.scss
index d32f609..d0282c0 100644
--- a/app/assets/stylesheets/responsive/custom.scss
+++ b/app/assets/stylesheets/responsive/custom.scss
@@ -33,6 +33,52 @@
   }
 }
 
+
+#navigation .more-menu {
+  background-color: #333;
+}
+
+.account-link:after {
+  position: relative;
+  top: -0.15em;
+  margin-left: 1em;
+  font-size: 0.5em;
+  content: "▼";
+}
+
+.logged-in-menu {
+  color: black;
+  box-shadow: 0 3px 15px 0 rgba(0, 0, 0, 0.1);
+}
+
+#navigation .logged-in-menu a,
+#navigation .logged-in-menu__signout-link a {
+  color: #197ace;
+  text-decoration: none;
+  transition: none;
+  &:hover {
+    color: #197ace;
+    background-color: transparent;
+    text-decoration: underline;
+  }
+}
+
+#navigation .logged-in-menu__signout-link a {
+  text-transform: uppercase;
+  font-weight: bold;
+  font-size: 0.8em;
+  color: #888;
+  &:hover {
+    color: #888;
+  }
+}
+
+.pro-pill {
+  color: #567386;
+  font-weight: 600;
+  background-color: #FFFF00;
+}
+
 /* General styles */
 body{
   background-color: $body-bg;
diff --git a/lib/alavetelitheme.rb b/lib/alavetelitheme.rb
index 0658142..c472d34 100644
--- a/lib/alavetelitheme.rb
+++ b/lib/alavetelitheme.rb
@@ -45,6 +45,20 @@ $alaveteli_route_extensions << 'custom-routes.rb'
   Rails.application.config.assets.paths.unshift theme_asset_path
 end
 
+# Append individual theme assets to the asset path
+theme_asset_path = File.join(File.dirname(__FILE__),
+                             '..',
+                             'app',
+                             'assets')
+theme_asset_path = Pathname.new(theme_asset_path).cleanpath.to_s
+
+LOOSE_THEME_ASSETS = lambda do |logical_path, filename|
+  filename.start_with?(theme_asset_path) &&
+  !['.js', '.css', ''].include?(File.extname(logical_path))
+end
+
+Rails.application.config.assets.precompile.unshift(LOOSE_THEME_ASSETS)
+
 # Tell FastGettext about the theme's translations: look in the theme's
 # locale-theme directory for a translation in the first place, and if
 # it isn't found, look in the Alaveteli locale directory next:
diff --git a/lib/config/custom-routes.rb b/lib/config/custom-routes.rb
index 98fccf7..efbf95e 100644
--- a/lib/config/custom-routes.rb
+++ b/lib/config/custom-routes.rb
@@ -3,7 +3,7 @@
 
 Rails.application.routes.draw do
   # brand new controller example
-  # match '/mycontroller' => 'general#mycontroller'
+  # get '/mycontroller' => 'general#mycontroller'
   # Additional help page example
-  # match '/help/help_out' => 'help#help_out'
+  # get '/help/help_out' => 'help#help_out'
 end
diff --git a/lib/views/general/_orglink.html.erb b/lib/views/general/_orglink.html.erb
deleted file mode 100644
index b22d123..0000000
--- a/lib/views/general/_orglink.html.erb
+++ /dev/null
@@ -1 +0,0 @@
-<%= link_to image_tag('old-logo.png', :alt => 'Alaveteli logo'), frontpage_url, :id=>'logo' %>