Merge pull request #337 from mezuro/update_home_again

Update home and remove menu

Merge pull request #337 from mezuro/update_home_again
Update home and remove menu
Diego de Araújo Martinez Camarinha
2 parents b4fcf54e f0955baf
Showing 19 changed files with 210 additions and 113 deletions Show diff stats
CHANGELOG.rdoc
app/assets/stylesheets/bootstrap_and_overrides.css.less
app/controllers/home_controller.rb
app/models/kalibro_configuration.rb
app/models/repository.rb
app/views/home/index.html.erb
app/views/layouts/application.html.erb
app/views/shared/_footer.html.erb
app/views/shared/_navbar.html.erb
config/locales/views/home/en.yml
config/locales/views/home/pt.yml
config/locales/views/layouts/en.yml
config/locales/views/layouts/pt.yml
features/homepage.feature
features/step_definitions/homepage_steps.rb
features/users/user_update.feature
spec/controllers/home_controller_spec.rb
spec/models/kalibro_configuration_spec.rb
spec/models/repository_spec.rb
@@ -5,6 +5,10 @@ Prezento is the web interface for Mezuro.
 == Unreleased
  
 * Remove Show button for hotspot metric configurations
+* Remove side menu
+* Refactor footer as a grid
+* Add latest repositories list to the homepage
+* Add latest configurations list to the homepage
  
 == v0.11.3 - 01/04/2016
  
@@ -40,19 +40,6 @@
  
 //@import "datepicker/datepicker";
  
-footer div {
-  width: 50%;
-}
-
-.footer-right {
-  float: right;
-  text-align: right;
-}
-
-.footer-left {
-  float: left;
-}
-
 #error_explanation {
   background-color: #F2DEDE;
   border-color: #EED3D7;
 class HomeController < ApplicationController
   def index
     @latest_projects = Project.latest(5)
+    @latest_repositories = Repository.latest(5)
+    @latest_configurations = KalibroConfiguration.latest(5)
   end
 end
@@ -28,4 +28,8 @@ class KalibroConfiguration &lt; KalibroClient::Entities::Configurations::KalibroCon
     @attributes = nil
     super
   end
+
+  def self.latest(count=1)
+    all.sort { |one, another| another.id <=> one.id }.select { |kalibro_configuration| kalibro_configuration.attributes.public }.first(count)
+  end
 end
 class Repository < KalibroClient::Entities::Processor::Repository
   include KalibroRecord
+
+  def self.latest(count=1)
+    all.sort { |one, another| another.id <=> one.id }.first(count)
+  end
 end
@@ -6,12 +6,40 @@
   </p>
 </div>
  
-<h2><%= t('latest_projects') %></h2>
+<div class="container-fluid">
+  <div class="row">
+    <div class="col-md-4">
+      <h2><%= t('latest_projects') %></h2>
  
-<ul>
-  <% cache do %>
-    <% @latest_projects.each do |project| %>
-      <li><%= link_to(project.name, project_path(project.id)) %></li>
-    <% end %>
-  <% end %>
-</ul>
+      <ul>
+        <% cache action_suffix: 'latest_projects' do %>
+          <% @latest_projects.each do |project| %>
+            <li><%= link_to(project.name, project_path(project.id)) %></li>
+          <% end %>
+        <% end %>
+      </ul>
+    </div>
+    <div class="col-md-4">
+      <h2><%= t('latest_repositories') %></h2>
+
+      <ul>
+        <% cache action_suffix: 'latest_repositories' do %>
+          <% @latest_repositories.each do |repository| %>
+            <li><%= link_to(repository.name, repository_path(repository.id)) %></li>
+          <% end %>
+        <% end %>
+      </ul>
+    </div>
+    <div class="col-md-4">
+      <h2><%= t('latest_configurations') %></h2>
+
+      <ul>
+        <% cache action_suffix: 'latest_configurations' do %>
+          <% @latest_configurations.each do |configuration| %>
+            <li><%= link_to(configuration.name, kalibro_configuration_path(configuration.id)) %></li>
+          <% end %>
+        <% end %>
+      </ul>
+    </div>
+  </div>
+</div>
@@ -45,95 +45,29 @@
   </head>
   <body>
  
-    <div class="navbar navbar-default">
-      <div class="navbar-inner">
-        <div class="container-fluid">
-           <div class="navbar-header">
-              <button type="button" class="navbar-toggle collapsed" data-target="#nav-collapse" data-toggle="collapse">
-                <span class="icon-bar"></span>
-                <span class="icon-bar"></span>
-                <span class="icon-bar"></span>
-              </button>
-              <a><%= link_to image_tag('logo.png'), root_path, class: 'navbar-brand' %></a>
-          </div>
-          <div class="collapse navbar-collapse" id="nav-collapse">
-            <ul class="nav navbar-nav">
-              <li><%= link_to t('home'), root_path %></li>
-              <li><%= link_to Project.model_name.human, projects_path %></li>
-              <li><%= link_to Repository.model_name.human, repositories_path %></li>
-              <li><%= link_to KalibroConfiguration.model_name.human, kalibro_configurations_path %></li>
-              <li><%= link_to ReadingGroup.model_name.human, reading_groups_path %></li>
-            </ul>
-            <ul class="nav navbar-nav navbar-right">
-              <% if user_signed_in? %>
-                <li><%= link_to t('edit_account'), edit_user_registration_path %></li>
-                <li><%= link_to t('sign_out'), destroy_user_session_path, :method => :delete %></li>
-              <% else %>
-                <li><%= link_to t('sign_in'), new_user_session_path %></li>
-                <li><%= link_to t('sign_up'), new_user_registration_path %></li>
-              <% end %>
-              <li class="dropdown">
-                <a class="dropdown-toggle" aria-expanded="true" role="button" data-toggle="dropdown" href="#">
-                  <%= t('language') %>
-                  <span class="caret"></span>
-                </a>
-                <ul class="dropdown-menu" role="menu">
-                  <% I18n.available_locales.each do |locale| %>
-                    <li><%= link_to(locale.to_s, url_for(locale: locale), data: { no_turbolink: true }) %></li>
-                  <% end %>
-                </ul>
-              </li>
-            </ul>
-          </div><!--/.nav-collapse -->
-        </div>
-      </div>
-    </div>
+    <%= render partial: 'shared/navbar' %>
  
     <div class="container-fluid">
       <div class="row">
-        <div class="col-sm-3 col-md-3">
-          <div class="well sidebar-nav">
-            <ul class="list-group">
-              <% if user_signed_in? %>
-                <li class="nav-header"><%= t('hello_html', user: current_user.name) %></li>
-                <li class="list-group-item"><%= link_to t('your_projects'), user_projects_path(current_user.id) %></li>
-              <% end %>
-              <li class="nav-header"><%= t('tutorials') %></li>
-              <li class="list-group-item"><%= link_to t('analysis'), tutorials_path('analyzing') %></li>
-              <li class="list-group-item"><%= link_to t('configuring'), tutorials_path('configuring') %></li>
-              <li class="list-group-item" ><%= link_to t('keywords'), tutorials_path('keywords') %></li>
-              <% if content_for?(:sidebar) %>
-                <%= yield :sidebar %>
-              <% else %>
-                <%= render 'shared/short_about' %>
-              <% end %>
-            </ul>
-          </div><!--/.well -->
-        </div><!--/col-sm-3 col-md-3-->
-        <div class="col-sm-9 col-md-9">
-        <div class="alert alert-info" id="loader"><i class="fa fa-spinner fa-spin fa-lg"></i>&nbsp;&nbsp; <%= t('instant_loading_page') %></div>
+        <div class="col-sm-12 col-md-12">
+          <div class="alert alert-info" id="loader"><i class="fa fa-spinner fa-spin fa-lg"></i>&nbsp;&nbsp; <%= t('instant_loading_page') %></div>
  
           <%= bootstrap_flash %>
           <%= yield %>
         </div>
       </div><!--/row-->
-
-      <footer>
-        <div class="footer-left">&copy; <%= link_to(t('mezuro_team'), '/humans.txt') %> 2013-2015</div>
-        <div class="footer-right"><%= link_to(image_tag('agplv3-88x31.png'), 'http://www.gnu.org/licenses/agpl-3.0-standalone.html') %> <%= link_to image_tag('fork-me.png'), 'https://github.com/mezuro/prezento' %> <%= image_tag 'usp-cloud-nuvem-logo.png' %> <%= link_to image_tag('banner-ccsl.png', height: '40', width: '190'), 'http://ccsl.ime.usp.br/' %></div>
-      </footer>
-
-      <script type="text/javascript">
-        $(function() {
-          $( "#languages-accordion > div" ).accordion({
-            heightStyle: "content",
-            collapsible: true,
-            active: false
-          });
-        });
-      </script>
-
     </div> <!-- /container -->
  
+    <%= render partial: 'shared/footer' %>
+
+    <script type="text/javascript">
+      $(function() {
+        $( "#languages-accordion > div" ).accordion({
+          heightStyle: "content",
+          collapsible: true,
+          active: false
+        });
+      });
+    </script>
   </body>
 </html>
@@ -0,0 +1,17 @@
+<footer>
+  <div class="container-fluid">
+    <div class="row">
+      <div class="col-md-7">&copy; <%= link_to(t('mezuro_team'), '/humans.txt') %> 2013-2016</div>
+      <div class="col-md-5">
+        <div class="container-fluid">
+          <div class="row">
+            <div class="col-md-2"><%= link_to(image_tag('agplv3-88x31.png'), 'http://www.gnu.org/licenses/agpl-3.0-standalone.html') %></div>
+            <div class="col-md-2"><%= link_to image_tag('fork-me.png'), 'https://github.com/mezuro/prezento' %></div>
+            <div class="col-md-2"><%= image_tag 'usp-cloud-nuvem-logo.png' %></div>
+            <div class="col-md-6"><%= link_to image_tag('banner-ccsl.png', height: '40', width: '190'), 'http://ccsl.ime.usp.br/' %></div>
+          </div>
+        </div>
+      </div>
+    </div>
+  </div>
+</footer>
@@ -0,0 +1,52 @@
+<div class="navbar navbar-default">
+  <div class="navbar-inner">
+    <div class="container-fluid">
+      <div class="navbar-header">
+        <button type="button" class="navbar-toggle collapsed" data-target="#nav-collapse" data-toggle="collapse">
+          <span class="icon-bar"></span>
+          <span class="icon-bar"></span>
+          <span class="icon-bar"></span>
+        </button>
+        <a><%= link_to image_tag('logo.png'), root_path, class: 'navbar-brand' %></a>
+      </div>
+      <div class="collapse navbar-collapse" id="nav-collapse">
+        <ul class="nav navbar-nav">
+          <li><%= link_to t('home'), root_path %></li>
+          <li><%= link_to Project.model_name.human, projects_path %></li>
+          <li><%= link_to Repository.model_name.human, repositories_path %></li>
+          <li><%= link_to KalibroConfiguration.model_name.human, kalibro_configurations_path %></li>
+          <li><%= link_to ReadingGroup.model_name.human, reading_groups_path %></li>
+        </ul>
+        <ul class="nav navbar-nav navbar-right">
+          <% if user_signed_in? %>
+            <li class="dropdown">
+              <a class="dropdown-toggle" aria-expanded="true" role="button" data-toggle="dropdown" href="#">
+                <%= current_user.name %>
+                <span class="caret"></span>
+              </a>
+              <ul class="dropdown-menu" role="menu">
+                <li><%= link_to t('your_projects'), user_projects_path(current_user.id) %></li>
+                <li><%= link_to t('edit_account'), edit_user_registration_path %></li>
+                <li><%= link_to t('sign_out'), destroy_user_session_path, :method => :delete %></li>
+              </ul>
+            </li>
+          <% else %>
+            <li><%= link_to t('sign_in'), new_user_session_path %></li>
+            <li><%= link_to t('sign_up'), new_user_registration_path %></li>
+          <% end %>
+          <li class="dropdown">
+            <a class="dropdown-toggle" aria-expanded="true" role="button" data-toggle="dropdown" href="#">
+              <%= t('language') %>
+              <span class="caret"></span>
+            </a>
+            <ul class="dropdown-menu" role="menu">
+              <% I18n.available_locales.each do |locale| %>
+                <li><%= link_to(locale.to_s, url_for(locale: locale), data: { no_turbolink: true }) %></li>
+              <% end %>
+            </ul>
+          </li>
+        </ul>
+      </div><!--/.nav-collapse -->
+    </div>
+  </div>
+</div>
 \ No newline at end of file
 en:
   title_home_index: "Understanding Code Metrics"
-  body_home_index_html: "<p>This is Mezuro! A <strong>free/libre</strong> web platform for <strong>collaborative</strong> source code <strong>evaluation</strong>.</p> <p>Here you can evaluate your source code with the most popular SCMs (like Git and SVN), just by providing its URL. For now, you can evaluate <strong>C</strong>, <strong>C++</strong>, <strong>Java</strong>, <strong>Ruby</strong> and <strong>Python</strong> source codes, but we are looking forward to supporting more languages in the future (PHP is coming soon).</p>"
+  body_home_index_html: "<p>This is Mezuro! A <strong>free/libre</strong> web platform for <strong>collaborative</strong> source code <strong>evaluation</strong>.</p> <p>Here you can evaluate your source code with the most popular SCMs (like Git and SVN), just by providing its URL. For now, you can evaluate <strong>C</strong>, <strong>C++</strong>, <strong>Java</strong>, <strong>Ruby</strong>, <strong>Python</strong> and <strong>PHP</strong> source codes, but we are looking forward to supporting more languages in the future.</p>"
   body_feedback_home_index_html: "Mezuro is continuously under development. Try it and give us your %{href}."
   latest_projects: "Latest projects"
+  latest_repositories: "Latest repositories"
+  latest_configurations: "Latest configurations"
 pt:
   title_home_index: "Entendendo Métricas de Código"
-  body_home_index_html: "<p>Este é o Mezuro! Uma plataforma web <strong>livre</strong> para <strong>avaliação colaborativa</strong> de código fonte.</p> <p>Aqui você pode avaliar seu código fonte com os SCMs mais populares (como Git e SVN), apenas fornecendo sua URL. Por enquanto, você pode avaliar códigos em <strong>C</strong>, <strong>C++</strong>, <strong>Java</strong>, <strong>Ruby</strong> e <strong>Python<strong> mas nós pretendemos dar suporte a mais linguagens no futuro (PHP está muito próximo).</p>"
+  body_home_index_html: "<p>Este é o Mezuro! Uma plataforma web <strong>livre</strong> para <strong>avaliação colaborativa</strong> de código fonte.</p> <p>Aqui você pode avaliar seu código fonte com os SCMs mais populares (como Git e SVN), apenas fornecendo sua URL. Por enquanto, você pode avaliar códigos em <strong>C</strong>, <strong>C++</strong>, <strong>Java</strong>, <strong>Ruby</strong>, <strong>Python</strong> e <strong>PHP</strong> mas nós pretendemos dar suporte a mais linguagens no futuro.</p>"
   body_feedback_home_index_html: "Mezuro está sob constante desenvolvimento. Experimente e nos dê o seu %{href}."
   latest_projects: "Últimos projetos"
+  latest_repositories: "Últimos repositórios"
+  latest_configurations: "Últimas configurações"
 en:
-  hello_html: "Hello, %{user}"
   instant_loading_page: "Wait an instant while we are loading the page that you have requested."
   home: "Home"
   edit_account: "Edit Account"
 pt:
-  hello_html: "Olá, %{user}"
   instant_loading_page: "Espere um instante enquanto estamos carregando a página que você solicitou."
   home: "Início"
   edit_account: "Editar Conta"
@@ -3,21 +3,29 @@ Feature: Homepage
   As a regular user
   I want to have in one page useful links to manage my account and session
  
+  @kalibro_processor_restart
   Scenario: Before signing in
-    Given I am at the homepage
-    Then I should see "Sign In"
+    Given I have a project named "GCC"
+    Then I am at the homepage
+    And I should see "Home"
+    And I should see "Project"
+    And I should see "Repository"
+    And I should see "Configuration"
+    And I should see "Reading Group"
+    And I should see "Sign In"
     And I should see "Sign Up"
+    And I should see "Language"
     And I should see "Latest projects"
-    And I should see "Project"
+    And I should see "Latest repositories"
+    And I should see "Latest configurations"
+    Then I should see "GCC" only "1" times
  
   Scenario: Signed in
     Given I am a regular user
     And I am signed in
     And I am at the homepage
-    Then I should see "Edit"
+    Then I should see "Edit Account"
     And I should see "Sign Out"
-    And I should see "Latest projects"
-    And I should see "Project"
     And I should see "Your projects"
  
   Scenario: Language selection
@@ -12,4 +12,8 @@ end
  
 Then(/^I should see "(.+)"$/) do |text|
   expect(page).to have_content(text)
-end
 \ No newline at end of file
+end
+
+Then(/^I should see "(.*?)" only "(.*?)" times$/) do |text, times|
+  expect(page).to have_content(text, count: times.to_i)
+end
@@ -8,7 +8,9 @@ Feature: User update
     Given I am a regular user
     And I am signed in
     And I am at the homepage
-    When I click the Edit link
+    And I take a picture of the page
+    When I click the Diego Martinez link
+    And I click the Edit Account link
     And I fill the Name field with "Rafael Manzo"
     And I fill the Current password field with "password"
     And I press the Update button
@@ -5,6 +5,8 @@ describe HomeController, :type =&gt; :controller do
     context '#index' do
       before :each do
         Project.expects(:latest).with(5).returns([])
+        Repository.expects(:latest).with(5).returns([])
+        KalibroConfiguration.expects(:latest).with(5).returns([])
       end
  
       describe 'Rendering' do
@@ -70,6 +70,29 @@ describe KalibroConfiguration, :type =&gt; :model do
           end
         end
       end
+
+      describe 'latest' do
+        let!(:kalibro_configuration) { FactoryGirl.build(:kalibro_configuration, id: 1) }
+        let!(:another_kalibro_configuration) { FactoryGirl.build(:another_kalibro_configuration, id: 2) }
+        let!(:kalibro_configuration_attributes) { FactoryGirl.build(:kalibro_configuration_attributes) }
+
+        before :each do
+          kalibro_configuration.expects(:attributes).returns(kalibro_configuration_attributes)
+          another_kalibro_configuration.expects(:attributes).returns(kalibro_configuration_attributes)
+
+          KalibroConfiguration.expects(:all).returns([kalibro_configuration, another_kalibro_configuration])
+        end
+
+        it 'should return the two kalibro_configurations ordered' do
+          expect(KalibroConfiguration.latest(2)).to eq([another_kalibro_configuration, kalibro_configuration])
+        end
+
+        context 'when no parameter is passed' do
+          it 'should return just the most recent kalibro_configuration' do
+            expect(KalibroConfiguration.latest).to eq([another_kalibro_configuration])
+          end
+        end
+      end
     end
  
     describe 'destroy' do
@@ -0,0 +1,24 @@
+require 'rails_helper'
+
+describe Repository do
+  describe 'class method' do
+    describe 'latest' do
+      let!(:repository) { FactoryGirl.build(:repository, id: 1) }
+      let!(:another_repository) { FactoryGirl.build(:another_repository, id: 2) }
+
+      before do
+        Repository.expects(:all).returns([repository, another_repository])
+      end
+
+      it 'should return the two repositorys ordered' do
+        expect(Repository.latest(2)).to eq([another_repository, repository])
+      end
+
+      context 'when no parameter is passed' do
+        it 'should return just the most recent repository' do
+          expect(Repository.latest).to eq([another_repository])
+        end
+      end
+    end
+  end
+end
 \ No newline at end of file
...	...	@@ -5,6 +5,10 @@ Prezento is the web interface for Mezuro.
5	5	== Unreleased
6	6
7	7	* Remove Show button for hotspot metric configurations
	8	+* Remove side menu
	9	+* Refactor footer as a grid
	10	+* Add latest repositories list to the homepage
	11	+* Add latest configurations list to the homepage
8	12
9	13	== v0.11.3 - 01/04/2016
10	14
...	...
...	...	@@ -40,19 +40,6 @@
40	40
41	41	//@import "datepicker/datepicker";
42	42
43		-footer div {
44		- width: 50%;
45		-}
46		-
47		-.footer-right {
48		- float: right;
49		- text-align: right;
50		-}
51		-
52		-.footer-left {
53		- float: left;
54		-}
55		-
56	43	#error_explanation {
57	44	background-color: #F2DEDE;
58	45	border-color: #EED3D7;
...	...
1	1	class HomeController < ApplicationController
2	2	def index
3	3	@latest_projects = Project.latest(5)
	4	+ @latest_repositories = Repository.latest(5)
	5	+ @latest_configurations = KalibroConfiguration.latest(5)
4	6	end
5	7	end
...	...
...	...	@@ -28,4 +28,8 @@ class KalibroConfiguration < KalibroClient::Entities::Configurations::KalibroCon
28	28	@attributes = nil
29	29	super
30	30	end
	31	+
	32	+ def self.latest(count=1)
	33	+ all.sort { \|one, another\| another.id <=> one.id }.select { \|kalibro_configuration\| kalibro_configuration.attributes.public }.first(count)
	34	+ end
31	35	end
...	...
1	1	class Repository < KalibroClient::Entities::Processor::Repository
2	2	include KalibroRecord
	3	+
	4	+ def self.latest(count=1)
	5	+ all.sort { \|one, another\| another.id <=> one.id }.first(count)
	6	+ end
3	7	end
...	...
...	...	@@ -6,12 +6,40 @@
6	6	</p>
7	7	</div>
8	8
9		-<h2><%= t('latest_projects') %></h2>
	9	+<div class="container-fluid">
	10	+ <div class="row">
	11	+ <div class="col-md-4">
	12	+ <h2><%= t('latest_projects') %></h2>
10	13
11		-<ul>
12		- <% cache do %>
13		- <% @latest_projects.each do \|project\| %>
14		- <li><%= link_to(project.name, project_path(project.id)) %></li>
15		- <% end %>
16		- <% end %>
17		-</ul>
	14	+ <ul>
	15	+ <% cache action_suffix: 'latest_projects' do %>
	16	+ <% @latest_projects.each do \|project\| %>
	17	+ <li><%= link_to(project.name, project_path(project.id)) %></li>
	18	+ <% end %>
	19	+ <% end %>
	20	+ </ul>
	21	+ </div>
	22	+ <div class="col-md-4">
	23	+ <h2><%= t('latest_repositories') %></h2>
	24	+
	25	+ <ul>
	26	+ <% cache action_suffix: 'latest_repositories' do %>
	27	+ <% @latest_repositories.each do \|repository\| %>
	28	+ <li><%= link_to(repository.name, repository_path(repository.id)) %></li>
	29	+ <% end %>
	30	+ <% end %>
	31	+ </ul>
	32	+ </div>
	33	+ <div class="col-md-4">
	34	+ <h2><%= t('latest_configurations') %></h2>
	35	+
	36	+ <ul>
	37	+ <% cache action_suffix: 'latest_configurations' do %>
	38	+ <% @latest_configurations.each do \|configuration\| %>
	39	+ <li><%= link_to(configuration.name, kalibro_configuration_path(configuration.id)) %></li>
	40	+ <% end %>
	41	+ <% end %>
	42	+ </ul>
	43	+ </div>
	44	+ </div>
	45	+</div>
...	...
...	...	@@ -45,95 +45,29 @@
45	45	</head>
46	46	<body>
47	47
48		- <div class="navbar navbar-default">
49		- <div class="navbar-inner">
50		- <div class="container-fluid">
51		- <div class="navbar-header">
52		- <button type="button" class="navbar-toggle collapsed" data-target="#nav-collapse" data-toggle="collapse">
53		- <span class="icon-bar"></span>
54		- <span class="icon-bar"></span>
55		- <span class="icon-bar"></span>
56		- </button>
57		- <a><%= link_to image_tag('logo.png'), root_path, class: 'navbar-brand' %></a>
58		- </div>
59		- <div class="collapse navbar-collapse" id="nav-collapse">
60		- <ul class="nav navbar-nav">
61		- <li><%= link_to t('home'), root_path %></li>
62		- <li><%= link_to Project.model_name.human, projects_path %></li>
63		- <li><%= link_to Repository.model_name.human, repositories_path %></li>
64		- <li><%= link_to KalibroConfiguration.model_name.human, kalibro_configurations_path %></li>
65		- <li><%= link_to ReadingGroup.model_name.human, reading_groups_path %></li>
66		- </ul>
67		- <ul class="nav navbar-nav navbar-right">
68		- <% if user_signed_in? %>
69		- <li><%= link_to t('edit_account'), edit_user_registration_path %></li>
70		- <li><%= link_to t('sign_out'), destroy_user_session_path, :method => :delete %></li>
71		- <% else %>
72		- <li><%= link_to t('sign_in'), new_user_session_path %></li>
73		- <li><%= link_to t('sign_up'), new_user_registration_path %></li>
74		- <% end %>
75		- <li class="dropdown">
76		- <a class="dropdown-toggle" aria-expanded="true" role="button" data-toggle="dropdown" href="#">
77		- <%= t('language') %>
78		- <span class="caret"></span>
79		- </a>
80		- <ul class="dropdown-menu" role="menu">
81		- <% I18n.available_locales.each do \|locale\| %>
82		- <li><%= link_to(locale.to_s, url_for(locale: locale), data: { no_turbolink: true }) %></li>
83		- <% end %>
84		- </ul>
85		- </li>
86		- </ul>
87		- </div><!--/.nav-collapse -->
88		- </div>
89		- </div>
90		- </div>
	48	+ <%= render partial: 'shared/navbar' %>
91	49
92	50	<div class="container-fluid">
93	51	<div class="row">
94		- <div class="col-sm-3 col-md-3">
95		- <div class="well sidebar-nav">
96		- <ul class="list-group">
97		- <% if user_signed_in? %>
98		- <li class="nav-header"><%= t('hello_html', user: current_user.name) %></li>
99		- <li class="list-group-item"><%= link_to t('your_projects'), user_projects_path(current_user.id) %></li>
100		- <% end %>
101		- <li class="nav-header"><%= t('tutorials') %></li>
102		- <li class="list-group-item"><%= link_to t('analysis'), tutorials_path('analyzing') %></li>
103		- <li class="list-group-item"><%= link_to t('configuring'), tutorials_path('configuring') %></li>
104		- <li class="list-group-item" ><%= link_to t('keywords'), tutorials_path('keywords') %></li>
105		- <% if content_for?(:sidebar) %>
106		- <%= yield :sidebar %>
107		- <% else %>
108		- <%= render 'shared/short_about' %>
109		- <% end %>
110		- </ul>
111		- </div><!--/.well -->
112		- </div><!--/col-sm-3 col-md-3-->
113		- <div class="col-sm-9 col-md-9">
114		- <div class="alert alert-info" id="loader"><i class="fa fa-spinner fa-spin fa-lg"></i>   <%= t('instant_loading_page') %></div>
	52	+ <div class="col-sm-12 col-md-12">
	53	+ <div class="alert alert-info" id="loader"><i class="fa fa-spinner fa-spin fa-lg"></i>   <%= t('instant_loading_page') %></div>
115	54
116	55	<%= bootstrap_flash %>
117	56	<%= yield %>
118	57	</div>
119	58	</div><!--/row-->
120		-
121		- <footer>
122		- <div class="footer-left">© <%= link_to(t('mezuro_team'), '/humans.txt') %> 2013-2015</div>
123		- <div class="footer-right"><%= link_to(image_tag('agplv3-88x31.png'), 'http://www.gnu.org/licenses/agpl-3.0-standalone.html') %> <%= link_to image_tag('fork-me.png'), 'https://github.com/mezuro/prezento' %> <%= image_tag 'usp-cloud-nuvem-logo.png' %> <%= link_to image_tag('banner-ccsl.png', height: '40', width: '190'), 'http://ccsl.ime.usp.br/' %></div>
124		- </footer>
125		-
126		- <script type="text/javascript">
127		- $(function() {
128		- $( "#languages-accordion > div" ).accordion({
129		- heightStyle: "content",
130		- collapsible: true,
131		- active: false
132		- });
133		- });
134		- </script>
135		-
136	59	</div> <!-- /container -->
137	60
	61	+ <%= render partial: 'shared/footer' %>
	62	+
	63	+ <script type="text/javascript">
	64	+ $(function() {
	65	+ $( "#languages-accordion > div" ).accordion({
	66	+ heightStyle: "content",
	67	+ collapsible: true,
	68	+ active: false
	69	+ });
	70	+ });
	71	+ </script>
138	72	</body>
139	73	</html>
...	...
...	...	@@ -0,0 +1,17 @@
	1	+<footer>
	2	+ <div class="container-fluid">
	3	+ <div class="row">
	4	+ <div class="col-md-7">© <%= link_to(t('mezuro_team'), '/humans.txt') %> 2013-2016</div>
	5	+ <div class="col-md-5">
	6	+ <div class="container-fluid">
	7	+ <div class="row">
	8	+ <div class="col-md-2"><%= link_to(image_tag('agplv3-88x31.png'), 'http://www.gnu.org/licenses/agpl-3.0-standalone.html') %></div>
	9	+ <div class="col-md-2"><%= link_to image_tag('fork-me.png'), 'https://github.com/mezuro/prezento' %></div>
	10	+ <div class="col-md-2"><%= image_tag 'usp-cloud-nuvem-logo.png' %></div>
	11	+ <div class="col-md-6"><%= link_to image_tag('banner-ccsl.png', height: '40', width: '190'), 'http://ccsl.ime.usp.br/' %></div>
	12	+ </div>
	13	+ </div>
	14	+ </div>
	15	+ </div>
	16	+ </div>
	17	+</footer>
...	...
...	...	@@ -0,0 +1,52 @@
	1	+<div class="navbar navbar-default">
	2	+ <div class="navbar-inner">
	3	+ <div class="container-fluid">
	4	+ <div class="navbar-header">
	5	+ <button type="button" class="navbar-toggle collapsed" data-target="#nav-collapse" data-toggle="collapse">
	6	+ <span class="icon-bar"></span>
	7	+ <span class="icon-bar"></span>
	8	+ <span class="icon-bar"></span>
	9	+ </button>
	10	+ <a><%= link_to image_tag('logo.png'), root_path, class: 'navbar-brand' %></a>
	11	+ </div>
	12	+ <div class="collapse navbar-collapse" id="nav-collapse">
	13	+ <ul class="nav navbar-nav">
	14	+ <li><%= link_to t('home'), root_path %></li>
	15	+ <li><%= link_to Project.model_name.human, projects_path %></li>
	16	+ <li><%= link_to Repository.model_name.human, repositories_path %></li>
	17	+ <li><%= link_to KalibroConfiguration.model_name.human, kalibro_configurations_path %></li>
	18	+ <li><%= link_to ReadingGroup.model_name.human, reading_groups_path %></li>
	19	+ </ul>
	20	+ <ul class="nav navbar-nav navbar-right">
	21	+ <% if user_signed_in? %>
	22	+ <li class="dropdown">
	23	+ <a class="dropdown-toggle" aria-expanded="true" role="button" data-toggle="dropdown" href="#">
	24	+ <%= current_user.name %>
	25	+ <span class="caret"></span>
	26	+ </a>
	27	+ <ul class="dropdown-menu" role="menu">
	28	+ <li><%= link_to t('your_projects'), user_projects_path(current_user.id) %></li>
	29	+ <li><%= link_to t('edit_account'), edit_user_registration_path %></li>
	30	+ <li><%= link_to t('sign_out'), destroy_user_session_path, :method => :delete %></li>
	31	+ </ul>
	32	+ </li>
	33	+ <% else %>
	34	+ <li><%= link_to t('sign_in'), new_user_session_path %></li>
	35	+ <li><%= link_to t('sign_up'), new_user_registration_path %></li>
	36	+ <% end %>
	37	+ <li class="dropdown">
	38	+ <a class="dropdown-toggle" aria-expanded="true" role="button" data-toggle="dropdown" href="#">
	39	+ <%= t('language') %>
	40	+ <span class="caret"></span>
	41	+ </a>
	42	+ <ul class="dropdown-menu" role="menu">
	43	+ <% I18n.available_locales.each do \|locale\| %>
	44	+ <li><%= link_to(locale.to_s, url_for(locale: locale), data: { no_turbolink: true }) %></li>
	45	+ <% end %>
	46	+ </ul>
	47	+ </li>
	48	+ </ul>
	49	+ </div><!--/.nav-collapse -->
	50	+ </div>
	51	+ </div>
	52	+</div>
0	53	\ No newline at end of file
...	...
1	1	en:
2	2	title_home_index: "Understanding Code Metrics"
3		- body_home_index_html: "<p>This is Mezuro! A <strong>free/libre</strong> web platform for <strong>collaborative</strong> source code <strong>evaluation</strong>.</p> <p>Here you can evaluate your source code with the most popular SCMs (like Git and SVN), just by providing its URL. For now, you can evaluate <strong>C</strong>, <strong>C++</strong>, <strong>Java</strong>, <strong>Ruby</strong> and <strong>Python</strong> source codes, but we are looking forward to supporting more languages in the future (PHP is coming soon).</p>"
	3	+ body_home_index_html: "<p>This is Mezuro! A <strong>free/libre</strong> web platform for <strong>collaborative</strong> source code <strong>evaluation</strong>.</p> <p>Here you can evaluate your source code with the most popular SCMs (like Git and SVN), just by providing its URL. For now, you can evaluate <strong>C</strong>, <strong>C++</strong>, <strong>Java</strong>, <strong>Ruby</strong>, <strong>Python</strong> and <strong>PHP</strong> source codes, but we are looking forward to supporting more languages in the future.</p>"
4	4	body_feedback_home_index_html: "Mezuro is continuously under development. Try it and give us your %{href}."
5	5	latest_projects: "Latest projects"
	6	+ latest_repositories: "Latest repositories"
	7	+ latest_configurations: "Latest configurations"
...	...