From 3c7f2c3d34a7ace58e830fe22e1cd66719217d30 Mon Sep 17 00:00:00 2001 From: Beatriz Rezener Date: Fri, 3 Oct 2014 08:41:33 -0300 Subject: [PATCH] Updating bootstrap version. Home and Layout views changed. Issue #124. --- Gemfile | 2 +- Gemfile.lock | 312 ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------ app/assets/stylesheets/bootstrap_and_overrides.css | 10 ++++++++++ app/views/home/index.html.erb | 2 +- app/views/layouts/application.html.erb | 42 ++++++++++++++++++++++-------------------- app/views/shared/_short_about.html.erb | 6 ++---- 6 files changed, 36 insertions(+), 338 deletions(-) delete mode 100644 Gemfile.lock diff --git a/Gemfile b/Gemfile index 1d38167..57f8bf8 100644 --- a/Gemfile +++ b/Gemfile @@ -37,7 +37,7 @@ gem 'kalibro_gatekeeper_client', '~> 1.0.0' gem "pg", "~> 0.17.0" # Twitter Bootstrap for layout -gem 'twitter-bootstrap-rails', :git => 'git://github.com/seyhunak/twitter-bootstrap-rails.git', :ref => '95de3b0' #Fixed the ref so it does not update accidentaly and breaks +gem 'twitter-bootstrap-rails', :git => 'git://github.com/seyhunak/twitter-bootstrap-rails.git', :ref => '3edf24d' #Fixed the ref so it does not update accidentaly and breaks # Chart generation gem "chart-js-rails", "~> 0.0.6" diff --git a/Gemfile.lock b/Gemfile.lock deleted file mode 100644 index 59f3f02..0000000 --- a/Gemfile.lock +++ /dev/null @@ -1,312 +0,0 @@ -GIT - remote: git://github.com/seyhunak/twitter-bootstrap-rails.git - revision: 95de3b0e288aede73d38a18cce30cde66e733558 - ref: 95de3b0 - specs: - twitter-bootstrap-rails (2.2.8) - actionpack (>= 3.1) - execjs - rails (>= 3.1) - railties (>= 3.1) - -GEM - remote: https://rubygems.org/ - specs: - actionmailer (4.1.5) - actionpack (= 4.1.5) - actionview (= 4.1.5) - mail (~> 2.5.4) - actionpack (4.1.5) - actionview (= 4.1.5) - activesupport (= 4.1.5) - rack (~> 1.5.2) - rack-test (~> 0.6.2) - actionview (4.1.5) - activesupport (= 4.1.5) - builder (~> 3.1) - erubis (~> 2.7.0) - activemodel (4.1.5) - activesupport (= 4.1.5) - builder (~> 3.1) - activerecord (4.1.5) - activemodel (= 4.1.5) - activesupport (= 4.1.5) - arel (~> 5.0.0) - activesupport (4.1.5) - i18n (~> 0.6, >= 0.6.9) - json (~> 1.7, >= 1.7.7) - minitest (~> 5.1) - thread_safe (~> 0.1) - tzinfo (~> 1.1) - arel (5.0.1.20140414130214) - bcrypt (3.1.7) - better_errors (2.0.0) - coderay (>= 1.0.0) - erubis (>= 2.6.6) - rack (>= 0.9.0) - binding_of_caller (0.7.2) - debug_inspector (>= 0.0.1) - builder (3.2.2) - capistrano (3.2.1) - i18n - rake (>= 10.0.0) - sshkit (~> 1.3) - capistrano-bundler (1.1.3) - capistrano (~> 3.1) - sshkit (~> 1.2) - capistrano-rails (1.1.2) - capistrano (~> 3.1) - capistrano-bundler (~> 1.1) - capistrano-rvm (0.1.1) - capistrano (~> 3.0) - sshkit (~> 1.2) - capybara (2.4.1) - mime-types (>= 1.16) - nokogiri (>= 1.3.3) - rack (>= 1.0.0) - rack-test (>= 0.5.4) - xpath (~> 2.0) - chart-js-rails (0.0.7) - railties (> 3.1) - cliver (0.3.2) - coderay (1.1.0) - coffee-rails (4.0.1) - coffee-script (>= 2.2.0) - railties (>= 4.0.0, < 5.0) - coffee-script (2.3.0) - coffee-script-source - execjs - coffee-script-source (1.8.0) - colorize (0.7.3) - colorpicker (0.0.5) - coveralls (0.7.1) - multi_json (~> 1.3) - rest-client - simplecov (>= 0.7) - term-ansicolor - thor - cucumber (1.3.16) - builder (>= 2.1.2) - diff-lcs (>= 1.1.3) - gherkin (~> 2.12) - multi_json (>= 1.7.5, < 2.0) - multi_test (>= 0.1.1) - cucumber-rails (1.4.1) - capybara (>= 1.1.2, < 3) - cucumber (>= 1.3.8, < 2) - mime-types (~> 1.16) - nokogiri (~> 1.5) - rails (>= 3, < 5) - dalli (2.7.2) - database_cleaner (1.3.0) - debug_inspector (0.0.2) - devise (3.3.0) - bcrypt (~> 3.0) - orm_adapter (~> 0.1) - railties (>= 3.2.6, < 5) - thread_safe (~> 0.1) - warden (~> 1.2.3) - diff-lcs (1.2.5) - docile (1.1.5) - erubis (2.7.0) - exception_notification (4.0.1) - actionmailer (>= 3.0.4) - activesupport (>= 3.0.4) - execjs (2.2.1) - factory_girl (4.4.0) - activesupport (>= 3.0.0) - factory_girl_rails (4.4.1) - factory_girl (~> 4.4.0) - railties (>= 3.0.0) - faraday (0.9.0) - multipart-post (>= 1.2, < 3) - faraday_middleware (0.9.1) - faraday (>= 0.7.4, < 0.10) - gherkin (2.12.2) - multi_json (~> 1.3) - google-analytics-rails (0.0.6) - hike (1.2.3) - i18n (0.6.11) - jbuilder (2.1.3) - activesupport (>= 3.0.0, < 5) - multi_json (~> 1.2) - jquery-rails (3.1.2) - railties (>= 3.0, < 5.0) - thor (>= 0.14, < 2.0) - jquery-ui-rails (5.0.0) - railties (>= 3.2.16) - json (1.8.1) - kalibro_gatekeeper_client (1.0.0) - activesupport (>= 2.2.1) - faraday_middleware (~> 0.9.0) - konacha (3.2.4) - actionpack (>= 3.1, < 5) - capybara - colorize - railties (>= 3.1, < 5) - sprockets - libv8 (3.16.14.5) - mail (2.5.4) - mime-types (~> 1.16) - treetop (~> 1.4.8) - metaclass (0.0.4) - mime-types (1.25.1) - mini_portile (0.6.0) - minitest (5.4.1) - mocha (1.1.0) - metaclass (~> 0.0.1) - multi_json (1.10.1) - multi_test (0.1.1) - multipart-post (2.0.0) - net-scp (1.2.1) - net-ssh (>= 2.6.5) - net-ssh (2.9.1) - netrc (0.7.7) - nokogiri (1.6.3.1) - mini_portile (= 0.6.0) - orm_adapter (0.5.0) - pg (0.17.1) - poltergeist (1.5.1) - capybara (~> 2.1) - cliver (~> 0.3.1) - multi_json (~> 1.0) - websocket-driver (>= 0.2.0) - polyglot (0.3.5) - rack (1.5.2) - rack-test (0.6.2) - rack (>= 1.0) - rails (4.1.5) - actionmailer (= 4.1.5) - actionpack (= 4.1.5) - actionview (= 4.1.5) - activemodel (= 4.1.5) - activerecord (= 4.1.5) - activesupport (= 4.1.5) - bundler (>= 1.3.0, < 2.0) - railties (= 4.1.5) - sprockets-rails (~> 2.0) - railties (4.1.5) - actionpack (= 4.1.5) - activesupport (= 4.1.5) - rake (>= 0.8.7) - thor (>= 0.18.1, < 2.0) - rake (10.3.2) - rdoc (4.1.2) - json (~> 1.4) - ref (1.0.5) - rest-client (1.7.2) - mime-types (>= 1.16, < 3.0) - netrc (~> 0.7) - rspec-core (3.1.2) - rspec-support (~> 3.1.0) - rspec-expectations (3.1.0) - diff-lcs (>= 1.2.0, < 2.0) - rspec-support (~> 3.1.0) - rspec-mocks (3.1.0) - rspec-support (~> 3.1.0) - rspec-rails (3.1.0) - actionpack (>= 3.0) - activesupport (>= 3.0) - railties (>= 3.0) - rspec-core (~> 3.1.0) - rspec-expectations (~> 3.1.0) - rspec-mocks (~> 3.1.0) - rspec-support (~> 3.1.0) - rspec-support (3.1.0) - sass (3.2.19) - sass-rails (4.0.3) - railties (>= 4.0.0, < 5.0) - sass (~> 3.2.0) - sprockets (~> 2.8, <= 2.11.0) - sprockets-rails (~> 2.0) - sdoc (0.4.1) - json (~> 1.7, >= 1.7.7) - rdoc (~> 4.0) - shoulda-matchers (2.7.0) - activesupport (>= 3.0.0) - simplecov (0.9.0) - docile (~> 1.1.0) - multi_json - simplecov-html (~> 0.8.0) - simplecov-html (0.8.0) - spring (1.1.3) - sprockets (2.11.0) - hike (~> 1.2) - multi_json (~> 1.0) - rack (~> 1.0) - tilt (~> 1.1, != 1.3.0) - sprockets-rails (2.1.4) - actionpack (>= 3.0) - activesupport (>= 3.0) - sprockets (~> 2.8) - sqlite3 (1.3.9) - sshkit (1.5.1) - colorize - net-scp (>= 1.1.2) - net-ssh (>= 2.8.0) - term-ansicolor (1.3.0) - tins (~> 1.0) - therubyracer (0.12.1) - libv8 (~> 3.16.14.0) - ref - thor (0.19.1) - thread_safe (0.3.4) - tilt (1.4.1) - tins (1.3.2) - treetop (1.4.15) - polyglot - polyglot (>= 0.3.1) - turbolinks (2.3.0) - coffee-rails - tzinfo (1.2.2) - thread_safe (~> 0.1) - uglifier (2.5.3) - execjs (>= 0.3.0) - json (>= 1.8.0) - warden (1.2.3) - rack (>= 1.0) - websocket-driver (0.3.4) - xpath (2.0.0) - nokogiri (~> 1.3) - -PLATFORMS - ruby - -DEPENDENCIES - better_errors - binding_of_caller - capistrano (~> 3.2.1) - capistrano-bundler - capistrano-rails - capistrano-rvm (~> 0.1.0) - chart-js-rails (~> 0.0.6) - coffee-rails (~> 4.0.0) - colorpicker (~> 0.0.5) - coveralls - cucumber-rails (~> 1.4.0) - dalli (~> 2.7.0) - database_cleaner - devise (~> 3.3.0) - exception_notification (~> 4.0.1) - factory_girl_rails (~> 4.4.1) - google-analytics-rails (~> 0.0.6) - jbuilder (~> 2.1.2) - jquery-rails - jquery-ui-rails (~> 5.0.0) - kalibro_gatekeeper_client (~> 1.0.0) - konacha (~> 3.2.0) - mocha - pg (~> 0.17.0) - poltergeist (~> 1.5.0) - rails (= 4.1.5) - rspec-rails (~> 3.1.0) - sass-rails (~> 4.0.1) - sdoc - shoulda-matchers (~> 2.7.0) - simplecov - spring - sqlite3 - therubyracer - turbolinks - twitter-bootstrap-rails! - uglifier (>= 1.3.0) diff --git a/app/assets/stylesheets/bootstrap_and_overrides.css b/app/assets/stylesheets/bootstrap_and_overrides.css index 5f197d7..6a7aa93 100644 --- a/app/assets/stylesheets/bootstrap_and_overrides.css +++ b/app/assets/stylesheets/bootstrap_and_overrides.css @@ -45,3 +45,13 @@ footer div { .jquery-ui-accordion{ line-height: normal; /*overrides h3 line-height specifically for the accordion ones*/ } + +.nav-header{ + display: block; + padding: 3px 15px; + font-size: 11px; + font-weight: bold; + line-height: 20px; + color: #999999; + text-transform: uppercase; +} \ No newline at end of file diff --git a/app/views/home/index.html.erb b/app/views/home/index.html.erb index 45329ca..efa4b0e 100644 --- a/app/views/home/index.html.erb +++ b/app/views/home/index.html.erb @@ -1,4 +1,4 @@ -
+

Understanding Code Metrics

This is Mezuro! A free/libre web platform for collaborative source code evaluation.

diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb index 3830efc..c98d05f 100644 --- a/app/views/layouts/application.html.erb +++ b/app/views/layouts/application.html.erb @@ -45,23 +45,25 @@ -
+
- - - - - - <%= link_to image_tag('logo.png'), root_path, class: 'brand' %> -
-
    +
    + + <%= link_to image_tag('logo.png'), root_path, class: 'navbar-brand' %> +
    +
    -
    -
    +
    +
    -
      +
        <% if user_signed_in? %>
      • User info
        • -
      • Hello, <%= current_user.name %>
        • -
      • <%= link_to 'My projects', user_projects_path(current_user.id) %>
        • +
      • Hello, <%= current_user.name %>
        • +
      • <%= link_to 'My projects', user_projects_path(current_user.id) %>
        • <% end %>
      • Tutorials
        • -
      • <%= link_to 'Analysis', tutorials_path('analyzing') %>
        • -
      • <%= link_to 'Configuring', tutorials_path('configuring') %>
        • -
      • <%= link_to 'Keywords', tutorials_path('keywords') %>
        • +
      • <%= link_to 'Analysis', tutorials_path('analyzing') %>
        • +
      • <%= link_to 'Configuring', tutorials_path('configuring') %>
        • +
      • <%= link_to 'Keywords', tutorials_path('keywords') %>
        • <% if content_for?(:sidebar) %> <%= yield :sidebar %> <% else %> @@ -96,8 +98,8 @@ <% end %>
    -
    -
    +
    +
       Wait an instant while we are loading the page that you have requested.
    <%= bootstrap_flash %> diff --git a/app/views/shared/_short_about.html.erb b/app/views/shared/_short_about.html.erb index a80048d..7af89b9 100644 --- a/app/views/shared/_short_about.html.erb +++ b/app/views/shared/_short_about.html.erb @@ -1,7 +1,5 @@
  • About Mezuro
    • -
  • - The Mezuro project attempts to provide a platform to compare projects and metric techniques, teaching how to use metrics through configurations and code analysis, avoid technical debts and disseminate code metrics usage and understanding. -
  • -
  • +
  • + The Mezuro project attempts to provide a platform to compare projects and metric techniques, teaching how to use metrics through configurations and code analysis, avoid technical debts and disseminate code metrics usage and understanding.
     Here you can try the front-end, which we call Prezento. It interacts with the <%= link_to 'Kalibro Web Service', 'https://github.com/mezuro/kalibro', target: '_blank' %> and <%= link_to 'Kalibro Processor', 'https://github.com/mezuro/kalibro_processor', target: '_blank' %>. It is intended to be a service where you can evaluate your code quality and, if you want, define which set of metrics to use.
    • -- libgit2 0.21.2