Fix bugs to force new design work. Minor refactor and improvements. Refs #193

app/assets/stylesheets/application.scss

@@ -1,7 +1,3 @@
-//@import "vendor";
+@import "vendor";
 @import "main";
 @import "custom";
-
-//= require main
-//= require vendor
-//= require custom

app/views/layouts/application.html.haml

@@ -20,9 +20,7 @@
             .search
               .pic
               .field
-                %input.gray{:onclick => "if(this.value=='#{t "layout.search"}'){this.value='';this.className='black';}",
+                %input.gray{:onclick => "if(this.value=='#{t "layout.search"}'){this.value='';this.className='black';}", :onblur => "if(this.value==''){this.value='#{t "layout.search"}';this.className='gray';}", :type => "text", :value => "#{t "layout.search"}"}
-                :onblur => "if(this.value==''){this.value='#{t "layout.search"}';this.className='gray';}",
-                :type => "text", :value => "#{t "layout.search"}"}
             .user
               .avatar= image_tag 'ava.png', :alt => 'avatar', :height => "30"
               .profile

app/views/projects/_submenu.html.haml

@@ -9,6 +9,6 @@
       %li= link_to t("project_menu.commits"), commits_path(@project), {:class => (act == :index && contr == :commits) ? 'active' : ''}
       %li= link_to t("project_menu.builds"), project_build_lists_path(@project), {:class => (act == :index && contr == :builds) ? 'active' : ''}
       %li= link_to t("project_menu.tracker"), project_issues_path(@project), {:class => (act == :index && contr == :issues) ? 'active' : ''}
-      %li= link_to t("project_menu.wiki"), project_wiki_index_path(@project), {:class => (act == :index && contr == :wiki) ? 'active' : ''}
+      %li= link_to t("project_menu.wiki"), project_wiki_index_path(@project), {:class => contr == :wiki ? 'active' : ''}
       %li= link_to t("project_menu.readme"), "#" #pending
       %li= link_to t("project_menu.settings"), edit_project_path(@project), {:class => (act == :edit && contr == :projects) ? 'active' : ''}

app/views/wiki/_diff_data.html.haml

@@ -1 +1,4 @@
+.blob_header
+  .size= h(diff.deleted_file ? diff.a_path : diff.b_path)
+.clear
 .diff_data.highlight= render_diff(diff)

config/environments/production.rb

@@ -57,6 +57,9 @@ Rosa::Application.configure do
 
   # Generate digests for assets URLs
   config.assets.digest = true
+
+  # Precompile additional assets (application.js, application.css, and all non-JS/CSS are already added)
+  config.assets.precompile += %w()
 end
 
 # require 'stub_xml_rpc'

vendor/assets/javascripts/gollum/gollum.js

@@ -46,12 +46,9 @@ $(document).ready(function() {
       }
     });
 
-    // ATTENTION: santaux edited these lines
-    if ($('a.action-compare-revision').length) {
     $('a.action-compare-revision').click(function() {
       $("#version-form").submit();
     });
-    }
   //}