merge changes upstream

14 files changed, 118 insertions, 16 deletions

diff --git a/assets/stylesheets/responsive/custom.scss b/assets/stylesheets/responsive/custom.scss
index 53bcd79..4e7d010 100644
--- a/assets/stylesheets/responsive/custom.scss
+++ b/assets/stylesheets/responsive/custom.scss
@@ -211,6 +211,28 @@ a.link_button_green_large {
   @include button-primary($size: large);
 }
 
+
+/* Action Bar Mixins */
+
+@mixin follow-button {
+  border-top-right-radius: 0;
+  border-bottom-right-radius: 0;
+  margin-bottom: 0;
+}
+
+@mixin follower-count {
+  color: $color_dark_grey;
+  padding: 0.56em 1.25em;
+  border: 1px solid $color_light_grey;
+  position: relative;
+  left: -3px;
+  line-height: 1.6em;
+  border-left: 0;
+  border-radius: 3px;
+  border-top-left-radius: 0;
+  border-bottom-left-radius: 0;
+}
+
 /* Popups */
 
 .popup {
@@ -596,6 +618,27 @@ a.link_button_green_large {
 }
 
 /* Request page */
+.request-header__action-bar__actions {
+  .action-menu__button {
+    @include button-secondary();
+    &:after {
+      border-color: #a5a5a5 transparent transparent transparent;
+      right: 7%;
+    }
+  }
+
+  .action-bar__follow-button {
+    .track__action {
+      @include button-primary();
+      @include follow-button();
+    }
+  }
+
+  .action-bar__follower-count {
+    @include follower-count();
+  }
+}
+
 div.correspondence {
   background-color: $color_white;
   box-shadow: 0 2px 2px transparentize($color_black, 0.8);
@@ -606,7 +649,7 @@ div.correspondence {
 
 .incoming.correspondence {
   border-top: 8px solid $color_secondary;
-  a {
+  .correspondence_text a {
     color: $color_secondary;
   }
   a.link_to_this {
@@ -621,6 +664,11 @@ div.correspondence {
   }
 }
 
+a.correspondence__header__date,
+a.correspondence__header__date:visited {
+  color: #777;
+}
+
 .describe_state_form input[type="radio"] + label {
   display:inline;
 }
@@ -663,6 +711,14 @@ a.link_to_this {
   }
 }
 
+.sidebar {
+  .new-request-cta {
+    .new-request__make-new-requests {
+      @include button-primary();
+    }
+  }
+}
+
 .feed_link_sidebar .link_button_green {
   @include button-primary();
 }
@@ -701,6 +757,10 @@ a.link_to_this {
   color: $status-success;
 }
 
+.request-status-message {
+  color: $color_black;
+}
+
 /* Attachments*/
 
 .view_html_prefix {
@@ -819,14 +879,17 @@ dt {
 }
 
 /* Authority page */
-.action-bar__follower-count {
-  padding: 3px;
-  font-size: 1.1rem;
-}
+.authority__header__action-bar {
+  .action-bar__follow-button {
+    .track_action,
+    .link_button_green {
+      @include button-secondary();
+      @include follow-button();
+    }
+  }
 
-.action-bar__follow-button {
-  .link_button_green {
-    @include button-secondary();
+  .action-bar__follower-count {
+    @include follower-count();
   }
 }
 
@@ -857,6 +920,29 @@ dt {
     }
   }
 
+  .intro__title {
+    color: $color_white;
+    text-shadow: 0 1px 2px transparentize($color_black, 0.7);
+  }
+
+  .new-request__content {
+    background-color: $color_neutral_dark;
+    border-radius: 5px;
+    padding: 1.888888889em;
+  }
+
+  .new-request__title {
+    color: $color_white;
+    font-size: 1.4375em;
+    margin: 0 0 0.5em;
+  }
+
+  .new-request__description {
+    color: transparentize($color_white, 0.2);
+    @include ie8 {
+      color: $color_white;
+    }
+  }
   .new-request__make-new-requests {
     @include button-base;
     background-color: desaturate(darken($color_secondary, 10%), 5%);
@@ -929,4 +1015,4 @@ h2 {
 .footer {
   padding: 5em 0 8em;
   background-image: url(/assets/homepage-background.jpg);  
-}
\ No newline at end of file
+}
diff --git a/init.rb b/init.rb
index e69de29..197c7c2 100644
--- a/init.rb
+++ b/init.rb
@@ -0,0 +1 @@
+# -*- encoding : utf-8 -*-
diff --git a/install.rb b/install.rb
index f7732d3..c447292 100644
--- a/install.rb
+++ b/install.rb
@@ -1 +1,2 @@
+# -*- encoding : utf-8 -*-
 # Install hook code here
diff --git a/lib/alavetelitheme.rb b/lib/alavetelitheme.rb
index c245617..668d92a 100644
--- a/lib/alavetelitheme.rb
+++ b/lib/alavetelitheme.rb
@@ -1,3 +1,4 @@
+# -*- encoding : utf-8 -*-
 theme_name = File.split(File.expand_path("../..", __FILE__))[1]
 theme_name.gsub!('-', '_')
 THEME_NAME = theme_name
diff --git a/lib/config/custom-routes.rb b/lib/config/custom-routes.rb
index 6d4cda4..98fccf7 100644
--- a/lib/config/custom-routes.rb
+++ b/lib/config/custom-routes.rb
@@ -1,3 +1,4 @@
+# -*- encoding : utf-8 -*-
 # Here you can override or add to the pages in the core website
 
 Rails.application.routes.draw do
diff --git a/lib/controller_patches.rb b/lib/controller_patches.rb
index 5c48e70..6d796b0 100644
--- a/lib/controller_patches.rb
+++ b/lib/controller_patches.rb
@@ -1,3 +1,4 @@
+# -*- encoding : utf-8 -*-
 # Add a callback - to be executed before each request in development,
 # and at startup in production - to patch existing app classes.
 # Doing so in init/environment.rb wouldn't work in development, since
diff --git a/lib/customstates.rb b/lib/customstates.rb
index d801c92..323a105 100644
--- a/lib/customstates.rb
+++ b/lib/customstates.rb
@@ -1,3 +1,4 @@
+# -*- encoding : utf-8 -*-
 # See `http://alaveteli.org/docs/customising/themes/#customising-the-request-states`
 # for more explanation of this file
 
diff --git a/lib/model_patches.rb b/lib/model_patches.rb
index a4ca42e..4993c37 100644
--- a/lib/model_patches.rb
+++ b/lib/model_patches.rb
@@ -1,3 +1,4 @@
+# -*- encoding : utf-8 -*-
 # Add a callback - to be executed before each request in development,
 # and at startup in production - to patch existing app classes.
 # Doing so in init/environment.rb wouldn't work in development, since
@@ -10,6 +11,10 @@ Rails.configuration.to_prepare do
   # OutgoingMessage.class_eval do
   #   # Add intro paragraph to new request template
   #   def default_letter
+  #     # this line allows the default_letter text added by this
+  #     # method to be replaced by the value supplied by the API
+  #     # e.g. http://demo.alaveteli.org/new/tgq?default_letter=this+is+a+test
+  #     return @default_letter if @default_letter
   #     return nil if self.message_type == 'followup'
   #     "If you uncomment this line, this text will appear as default text in every message"
   #   end
diff --git a/lib/patch_mailer_paths.rb b/lib/patch_mailer_paths.rb
index 99da10a..4533be0 100644
--- a/lib/patch_mailer_paths.rb
+++ b/lib/patch_mailer_paths.rb
@@ -1,3 +1,4 @@
+# -*- encoding : utf-8 -*-
 # Add a callback - to be executed before each request in development,
 # and at startup in production - to patch existing app classes.
 # See http://stackoverflow.com/questions/7072758/plugin-not-reloading-in-development-mode
diff --git a/lib/tasks/alavetelitheme_tasks.rake b/lib/tasks/alavetelitheme_tasks.rake
index 1f1925b..3744d04 100644
--- a/lib/tasks/alavetelitheme_tasks.rake
+++ b/lib/tasks/alavetelitheme_tasks.rake
@@ -1,3 +1,4 @@
+# -*- encoding : utf-8 -*-
 # desc "Explaining what the task does"
 # task :alavetelitheme do
 #   # Task goes here
diff --git a/locale-theme/en/app.po b/locale-theme/en/app.po
index d2da165..6f58130 100644
--- a/locale-theme/en/app.po
+++ b/locale-theme/en/app.po
@@ -2,6 +2,6 @@
 # is a good place to put both translations specific to your theme, and
 # "translations" of the core English words (e.g. you might want to
 # call FOI "RTI" throughougout, like this:
-
-msgid "Make and browse Freedom of Information (FOI) requests"
-msgstr "Make and browse Right to Know (RTI) requests"
\ No newline at end of file
+#
+# msgid "Make and browse Freedom of Information (FOI) requests"
+# msgstr "Make and browse Right to Know (RTI) requests"
diff --git a/post_install.rb b/post_install.rb
index 2dfabfd..5aae9ca 100644
--- a/post_install.rb
+++ b/post_install.rb
@@ -1 +1,2 @@
+# -*- encoding : utf-8 -*-
 # This file is executed in the Rails evironment by the `rails-post-install` script
diff --git a/spec/alavetelitheme_spec.rb b/spec/alavetelitheme_spec.rb
index 0bb0fab..6d2b366 100644
--- a/spec/alavetelitheme_spec.rb
+++ b/spec/alavetelitheme_spec.rb
@@ -1,11 +1,12 @@
+# -*- encoding : utf-8 -*-
 # If defined, ALAVETELI_TEST_THEME will be loaded in config/initializers/theme_loader
 ALAVETELI_TEST_THEME = 'alavetelitheme'
 require File.expand_path(File.join(File.dirname(__FILE__),'..','..','..','..','spec','spec_helper'))
 
-describe "testing the truth" do
+describe 'testing the truth' do
 
-    it 'should be true' do
-        assert true
-    end
+  it 'should be true' do
+    expect(true).to eq(true)
+  end
 
 end
diff --git a/uninstall.rb b/uninstall.rb
index 9738333..f6e78fd 100644
--- a/uninstall.rb
+++ b/uninstall.rb
@@ -1 +1,2 @@
+# -*- encoding : utf-8 -*-
 # Uninstall hook code here