Merge branch 'master' into develop

83 files changed, 75 insertions, 18 deletions

diff --git a/assets/images/hamburger.png b/app/assets/images/hamburger.png
index 0c44f63..0c44f63 100644
--- a/assets/images/hamburger.png
+++ b/app/assets/images/hamburger.png
diff --git a/assets/images/home-grad.png b/app/assets/images/home-grad.png
index ff9887a..ff9887a 100644
--- a/assets/images/home-grad.png
+++ b/app/assets/images/home-grad.png
diff --git a/assets/images/homepage-background-small.jpg b/app/assets/images/homepage-background-small.jpg
index c503d25..c503d25 100644
--- a/assets/images/homepage-background-small.jpg
+++ b/app/assets/images/homepage-background-small.jpg
diff --git a/assets/images/homepage-background.jpg b/app/assets/images/homepage-background.jpg
index 426485d..426485d 100644
--- a/assets/images/homepage-background.jpg
+++ b/app/assets/images/homepage-background.jpg
diff --git a/assets/images/icon_application_octet-stream_large.png b/app/assets/images/icon_application_octet-stream_large.png
index 02347f1..02347f1 100644
--- a/assets/images/icon_application_octet-stream_large.png
+++ b/app/assets/images/icon_application_octet-stream_large.png
diff --git a/assets/images/icon_application_pdf_large.png b/app/assets/images/icon_application_pdf_large.png
index 1374851..1374851 100644
--- a/assets/images/icon_application_pdf_large.png
+++ b/app/assets/images/icon_application_pdf_large.png
diff --git a/assets/images/icon_application_rtf_large.png b/app/assets/images/icon_application_rtf_large.png
index fbed2e9..fbed2e9 100644
--- a/assets/images/icon_application_rtf_large.png
+++ b/app/assets/images/icon_application_rtf_large.png
diff --git a/assets/images/icon_application_vnd.ms-excel_large.png b/app/assets/images/icon_application_vnd.ms-excel_large.png
index 86e1ee4..86e1ee4 100644
--- a/assets/images/icon_application_vnd.ms-excel_large.png
+++ b/app/assets/images/icon_application_vnd.ms-excel_large.png
diff --git a/assets/images/icon_application_vnd.ms-powerpoint_large.png b/app/assets/images/icon_application_vnd.ms-powerpoint_large.png
index 6374b3b..6374b3b 100644
--- a/assets/images/icon_application_vnd.ms-powerpoint_large.png
+++ b/app/assets/images/icon_application_vnd.ms-powerpoint_large.png
diff --git a/assets/images/icon_application_vnd.ms-word_large.png b/app/assets/images/icon_application_vnd.ms-word_large.png
index 5a2916a..5a2916a 100644
--- a/assets/images/icon_application_vnd.ms-word_large.png
+++ b/app/assets/images/icon_application_vnd.ms-word_large.png
diff --git a/assets/images/icon_application_zip_large.png b/app/assets/images/icon_application_zip_large.png
index 042d8c7..042d8c7 100644
--- a/assets/images/icon_application_zip_large.png
+++ b/app/assets/images/icon_application_zip_large.png
diff --git a/assets/images/icon_image_bmp_large.png b/app/assets/images/icon_image_bmp_large.png
index 347bdaa..347bdaa 120000
--- a/assets/images/icon_image_bmp_large.png
+++ b/app/assets/images/icon_image_bmp_large.png
diff --git a/assets/images/icon_image_gif_large.png b/app/assets/images/icon_image_gif_large.png
index 347bdaa..347bdaa 120000
--- a/assets/images/icon_image_gif_large.png
+++ b/app/assets/images/icon_image_gif_large.png
diff --git a/assets/images/icon_image_img_large.png b/app/assets/images/icon_image_img_large.png
index 06e263d..06e263d 100644
--- a/assets/images/icon_image_img_large.png
+++ b/app/assets/images/icon_image_img_large.png
diff --git a/assets/images/icon_image_jpeg_large.png b/app/assets/images/icon_image_jpeg_large.png
index 347bdaa..347bdaa 120000
--- a/assets/images/icon_image_jpeg_large.png
+++ b/app/assets/images/icon_image_jpeg_large.png
diff --git a/assets/images/icon_image_png_large.png b/app/assets/images/icon_image_png_large.png
index 347bdaa..347bdaa 120000
--- a/assets/images/icon_image_png_large.png
+++ b/app/assets/images/icon_image_png_large.png
diff --git a/assets/images/icon_image_tiff_large.png b/app/assets/images/icon_image_tiff_large.png
index be2029a..be2029a 100644
--- a/assets/images/icon_image_tiff_large.png
+++ b/app/assets/images/icon_image_tiff_large.png
diff --git a/assets/images/icon_message_delivery-status_large.png b/app/assets/images/icon_message_delivery-status_large.png
index 8a895bc..8a895bc 100644
--- a/assets/images/icon_message_delivery-status_large.png
+++ b/app/assets/images/icon_message_delivery-status_large.png
diff --git a/assets/images/icon_text_html_large.png b/app/assets/images/icon_text_html_large.png
index f772ea3..f772ea3 100644
--- a/assets/images/icon_text_html_large.png
+++ b/app/assets/images/icon_text_html_large.png
diff --git a/assets/images/icon_text_plain_large.png b/app/assets/images/icon_text_plain_large.png
index fe31dc4..fe31dc4 100644
--- a/assets/images/icon_text_plain_large.png
+++ b/app/assets/images/icon_text_plain_large.png
diff --git a/assets/images/icon_text_x-vcard_large.png b/app/assets/images/icon_text_x-vcard_large.png
index 112ffb1..112ffb1 100644
--- a/assets/images/icon_text_x-vcard_large.png
+++ b/app/assets/images/icon_text_x-vcard_large.png
diff --git a/assets/images/icon_unknown.png b/app/assets/images/icon_unknown.png
index a10dd3d..a10dd3d 100644
--- a/assets/images/icon_unknown.png
+++ b/app/assets/images/icon_unknown.png
diff --git a/assets/images/link-icon.png b/app/assets/images/link-icon.png
index 7a6dd01..7a6dd01 100644
--- a/assets/images/link-icon.png
+++ b/app/assets/images/link-icon.png
diff --git a/assets/images/link-icon@2.png b/app/assets/images/link-icon@2.png
index eafb1e2..eafb1e2 100644
--- a/assets/images/link-icon@2.png
+++ b/app/assets/images/link-icon@2.png
diff --git a/assets/images/locale-switcher.png b/app/assets/images/locale-switcher.png
index 850cb9a..850cb9a 100644
--- a/assets/images/locale-switcher.png
+++ b/app/assets/images/locale-switcher.png
diff --git a/assets/images/logo-opengraph.png b/app/assets/images/logo-opengraph.png
index 4f495a5..4f495a5 100644
--- a/assets/images/logo-opengraph.png
+++ b/app/assets/images/logo-opengraph.png
diff --git a/assets/images/logo.png b/app/assets/images/logo.png
index 6f8e723..6f8e723 100644
--- a/assets/images/logo.png
+++ b/app/assets/images/logo.png
diff --git a/assets/images/logo@2.png b/app/assets/images/logo@2.png
index ab890df..ab890df 100644
--- a/assets/images/logo@2.png
+++ b/app/assets/images/logo@2.png
diff --git a/assets/images/navimg/logo-trans-small.png b/app/assets/images/navimg/logo-trans-small.png
index e9ad9ea..e9ad9ea 100644
--- a/assets/images/navimg/logo-trans-small.png
+++ b/app/assets/images/navimg/logo-trans-small.png
diff --git a/assets/images/old-logo.png b/app/assets/images/old-logo.png
index 8b88458..8b88458 100644
--- a/assets/images/old-logo.png
+++ b/app/assets/images/old-logo.png
diff --git a/assets/images/quote-marks.png b/app/assets/images/quote-marks.png
index e98f35c..e98f35c 100644
--- a/assets/images/quote-marks.png
+++ b/app/assets/images/quote-marks.png
diff --git a/assets/images/search.png b/app/assets/images/search.png
index ab38621..ab38621 100644
--- a/assets/images/search.png
+++ b/app/assets/images/search.png
diff --git a/assets/images/small-green-cross.png b/app/assets/images/small-green-cross.png
index 96ebac9..96ebac9 100644
--- a/assets/images/small-green-cross.png
+++ b/app/assets/images/small-green-cross.png
diff --git a/assets/images/status/classification.png b/app/assets/images/status/classification.png
index 5ffd8af..5ffd8af 100644
--- a/assets/images/status/classification.png
+++ b/app/assets/images/status/classification.png
diff --git a/assets/images/status/classification@2x.png b/app/assets/images/status/classification@2x.png
index c5e9ba8..c5e9ba8 100644
--- a/assets/images/status/classification@2x.png
+++ b/app/assets/images/status/classification@2x.png
diff --git a/assets/images/status/delayed.png b/app/assets/images/status/delayed.png
index e2c3a29..e2c3a29 100644
--- a/assets/images/status/delayed.png
+++ b/app/assets/images/status/delayed.png
diff --git a/assets/images/status/delayed@2x.png b/app/assets/images/status/delayed@2x.png
index 9de5293..9de5293 100644
--- a/assets/images/status/delayed@2x.png
+++ b/app/assets/images/status/delayed@2x.png
diff --git a/assets/images/status/delivery_error.png b/app/assets/images/status/delivery_error.png
index cd93f43..cd93f43 100644
--- a/assets/images/status/delivery_error.png
+++ b/app/assets/images/status/delivery_error.png
diff --git a/assets/images/status/delivery_error@2x.png b/app/assets/images/status/delivery_error@2x.png
index 10fcb0e..10fcb0e 100644
--- a/assets/images/status/delivery_error@2x.png
+++ b/app/assets/images/status/delivery_error@2x.png
diff --git a/assets/images/status/locked.png b/app/assets/images/status/locked.png
index b932609..b932609 100644
--- a/assets/images/status/locked.png
+++ b/app/assets/images/status/locked.png
diff --git a/assets/images/status/locked@2x.png b/app/assets/images/status/locked@2x.png
index 5f4ac75..5f4ac75 100644
--- a/assets/images/status/locked@2x.png
+++ b/app/assets/images/status/locked@2x.png
diff --git a/assets/images/status/notheld.png b/app/assets/images/status/notheld.png
index 042ecb3..042ecb3 100644
--- a/assets/images/status/notheld.png
+++ b/app/assets/images/status/notheld.png
diff --git a/assets/images/status/notheld@2x.png b/app/assets/images/status/notheld@2x.png
index bf1c1e8..bf1c1e8 100644
--- a/assets/images/status/notheld@2x.png
+++ b/app/assets/images/status/notheld@2x.png
diff --git a/assets/images/status/overdue.png b/app/assets/images/status/overdue.png
index aa1a391..aa1a391 100644
--- a/assets/images/status/overdue.png
+++ b/app/assets/images/status/overdue.png
diff --git a/assets/images/status/overdue@2x.png b/app/assets/images/status/overdue@2x.png
index 96e3b95..96e3b95 100644
--- a/assets/images/status/overdue@2x.png
+++ b/app/assets/images/status/overdue@2x.png
diff --git a/assets/images/status/partiallysuccessful.png b/app/assets/images/status/partiallysuccessful.png
index 99cecad..99cecad 100644
--- a/assets/images/status/partiallysuccessful.png
+++ b/app/assets/images/status/partiallysuccessful.png
diff --git a/assets/images/status/partiallysuccessful@2x.png b/app/assets/images/status/partiallysuccessful@2x.png
index f429896..f429896 100644
--- a/assets/images/status/partiallysuccessful@2x.png
+++ b/app/assets/images/status/partiallysuccessful@2x.png
diff --git a/assets/images/status/postal.png b/app/assets/images/status/postal.png
index ff53de6..ff53de6 100644
--- a/assets/images/status/postal.png
+++ b/app/assets/images/status/postal.png
diff --git a/assets/images/status/postal@2x.png b/app/assets/images/status/postal@2x.png
index 51c4036..51c4036 100644
--- a/assets/images/status/postal@2x.png
+++ b/app/assets/images/status/postal@2x.png
diff --git a/assets/images/status/refused.png b/app/assets/images/status/refused.png
index b49f73f..b49f73f 100644
--- a/assets/images/status/refused.png
+++ b/app/assets/images/status/refused.png
diff --git a/assets/images/status/refused@2x.png b/app/assets/images/status/refused@2x.png
index ea18dff..ea18dff 100644
--- a/assets/images/status/refused@2x.png
+++ b/app/assets/images/status/refused@2x.png
diff --git a/assets/images/status/reported.png b/app/assets/images/status/reported.png
index c86c635..c86c635 100644
--- a/assets/images/status/reported.png
+++ b/app/assets/images/status/reported.png
diff --git a/assets/images/status/reported@2x.png b/app/assets/images/status/reported@2x.png
index 5aab446..5aab446 100644
--- a/assets/images/status/reported@2x.png
+++ b/app/assets/images/status/reported@2x.png
diff --git a/assets/images/status/review.png b/app/assets/images/status/review.png
index 95b9c31..95b9c31 100644
--- a/assets/images/status/review.png
+++ b/app/assets/images/status/review.png
diff --git a/assets/images/status/review@2x.png b/app/assets/images/status/review@2x.png
index 0f95e0d..0f95e0d 100644
--- a/assets/images/status/review@2x.png
+++ b/app/assets/images/status/review@2x.png
diff --git a/assets/images/status/successful.png b/app/assets/images/status/successful.png
index 097035d..097035d 100644
--- a/assets/images/status/successful.png
+++ b/app/assets/images/status/successful.png
diff --git a/assets/images/status/successful@2x.png b/app/assets/images/status/successful@2x.png
index f863675..f863675 100644
--- a/assets/images/status/successful@2x.png
+++ b/app/assets/images/status/successful@2x.png
diff --git a/assets/images/status/unusual.png b/app/assets/images/status/unusual.png
index 3a83785..3a83785 100644
--- a/assets/images/status/unusual.png
+++ b/app/assets/images/status/unusual.png
diff --git a/assets/images/status/unusual@2x.png b/app/assets/images/status/unusual@2x.png
index 07e0bd9..07e0bd9 100644
--- a/assets/images/status/unusual@2x.png
+++ b/app/assets/images/status/unusual@2x.png
diff --git a/assets/images/status/waiting.png b/app/assets/images/status/waiting.png
index a668f70..a668f70 100644
--- a/assets/images/status/waiting.png
+++ b/app/assets/images/status/waiting.png
diff --git a/assets/images/status/waiting@2x.png b/app/assets/images/status/waiting@2x.png
index 4e84eb9..4e84eb9 100644
--- a/assets/images/status/waiting@2x.png
+++ b/app/assets/images/status/waiting@2x.png
diff --git a/assets/images/status/withdrawn.png b/app/assets/images/status/withdrawn.png
index 1a68146..1a68146 100644
--- a/assets/images/status/withdrawn.png
+++ b/app/assets/images/status/withdrawn.png
diff --git a/assets/images/status/withdrawn@2x.png b/app/assets/images/status/withdrawn@2x.png
index f023e7a..f023e7a 100644
--- a/assets/images/status/withdrawn@2x.png
+++ b/app/assets/images/status/withdrawn@2x.png
diff --git a/assets/images/widget-base.png b/app/assets/images/widget-base.png
index 85a0eff..85a0eff 100644
--- a/assets/images/widget-base.png
+++ b/app/assets/images/widget-base.png
diff --git a/assets/images/wordpress.png b/app/assets/images/wordpress.png
index 31955ac..31955ac 100644
--- a/assets/images/wordpress.png
+++ b/app/assets/images/wordpress.png
diff --git a/assets/stylesheets/custom.css.scss b/app/assets/stylesheets/custom.css.scss
index 6ca983e..6ca983e 100644
--- a/assets/stylesheets/custom.css.scss
+++ b/app/assets/stylesheets/custom.css.scss
diff --git a/assets/stylesheets/responsive/_settings.scss b/app/assets/stylesheets/responsive/_settings.scss
index 466c902..015aece 100644
--- a/assets/stylesheets/responsive/_settings.scss
+++ b/app/assets/stylesheets/responsive/_settings.scss
@@ -19,6 +19,10 @@ $color_red: #e04b4b;
 $color_violet: #a94ca6;
 $color_purple: #5c377f;
 $color_white: #ffffff;
+$color_off_white: #f3f1eb;
+$color_light_grey: #e2dfd9;
+$color_mid_grey: #959287;
+$color_dark_grey: #6c6b68;
 
 $color_neutral_light: $color_sand;
 $color_neutral_dark: $color_black;
diff --git a/assets/stylesheets/responsive/custom.scss b/app/assets/stylesheets/responsive/custom.scss
index aa6fd1e..d32f609 100644
--- a/assets/stylesheets/responsive/custom.scss
+++ b/app/assets/stylesheets/responsive/custom.scss
@@ -173,6 +173,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 {
@@ -543,17 +565,21 @@ a.link_button_green_large {
 .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 {
-    padding: 3px;
-    font-size: 1.1rem;
+    @include follower-count();
   }
 }
 
@@ -797,14 +823,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();
   }
 }
 
@@ -870,3 +899,14 @@ dt {
   }
 }
 
+// User menu
+.pro-pill {
+  background-color: desaturate(darken($color_secondary, 10%), 5%);
+}
+
+#logged_in_bar {
+  .logged-in-menu a,
+  .logged-in-menu__signout-link a {
+    color: $link-color;
+  }
+}
diff --git a/assets/stylesheets/widget.scss b/app/assets/stylesheets/widget.scss
index e0fa302..e0fa302 100644
--- a/assets/stylesheets/widget.scss
+++ b/app/assets/stylesheets/widget.scss
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..0658142 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
@@ -38,6 +39,7 @@ $alaveteli_route_extensions << 'custom-routes.rb'
 ['stylesheets', 'images', 'javascripts'].each do |asset_type|
   theme_asset_path = File.join(File.dirname(__FILE__),
                                '..',
+                               'app',
                                'assets',
                                asset_type)
   Rails.application.config.assets.paths.unshift theme_asset_path
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 b0c906f..d223e36 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
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/lib/views/help/contact.html.erb b/lib/views/help/contact.html.erb
index 5f467fe..2072d0c 100644
--- a/lib/views/help/contact.html.erb
+++ b/lib/views/help/contact.html.erb
@@ -93,8 +93,8 @@
 
   <div class="form_button">
     <%= hidden_field_tag(:submitted_contact_form, 1) %>
-    <%= submit_tag "Send message to the charity", :disable_with => "Sending..." %>
+    <%= submit_tag "Send message to the charity", :data => { :disable_with => "Sending..." } %>
     &lt;-- we run this site, not the Government!
   </div>
 
-<% end %>
\ No newline at end of file
+<% end %>
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