diff options
author | Aleksey Lim <alsroot@sugarlabs.org> | 2013-02-02 07:13:29 (GMT) |
---|---|---|
committer | Aleksey Lim <alsroot@sugarlabs.org> | 2013-02-03 12:59:25 (GMT) |
commit | cc3f8fe446820577babf961315ef01794fb83260 (patch) | |
tree | 5485e4511689a50ae702aae57b0fea8398a34c9c | |
parent | 0d3b4368b31024a49bc98b25a1a4488bdc502a0e (diff) |
Apply SL theme and SL infra related tweaks
-rw-r--r-- | app/models/site.rb | 2 | ||||
-rw-r--r-- | app/views/layouts/application.html.erb | 17 | ||||
-rw-r--r-- | config/locales/en.rb | 2 | ||||
-rw-r--r-- | config/locales/es.rb | 2 | ||||
-rw-r--r-- | config/locales/fr.rb | 2 | ||||
-rw-r--r-- | config/locales/pt-BR.rb | 2 | ||||
-rwxr-xr-x[-rw-r--r--] | data/hooks/post-commit | 0 | ||||
-rwxr-xr-x[-rw-r--r--] | data/hooks/pre-applypatch | 0 | ||||
-rwxr-xr-x[-rw-r--r--] | data/hooks/pre-commit | 0 | ||||
-rwxr-xr-x[-rw-r--r--] | data/hooks/pre-rebase | 0 | ||||
-rwxr-xr-x[-rw-r--r--] | data/hooks/pre_receive_guard.rb | 0 | ||||
-rw-r--r-- | public/stylesheets/base.css | 3 |
12 files changed, 24 insertions, 6 deletions
diff --git a/app/models/site.rb b/app/models/site.rb index 414c160..03406d1 100644 --- a/app/models/site.rb +++ b/app/models/site.rb @@ -19,7 +19,7 @@ class Site < ActiveRecord::Base has_many :projects validates_presence_of :title - HTTP_CLONING_SUBDOMAIN = 'git' + HTTP_CLONING_SUBDOMAIN = GitoriousConfig['http_clone_subdomain'] validates_exclusion_of :subdomain, :in => [HTTP_CLONING_SUBDOMAIN] attr_protected :subdomain diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb index 3006f37..6b8584e 100644 --- a/app/views/layouts/application.html.erb +++ b/app/views/layouts/application.html.erb @@ -32,6 +32,23 @@ <div id="system_message"> <p><strong><%= t("views.layout.system_notice") %>:</strong> <%= GitoriousConfig["system_message"] -%></p> </div> + <% else -%> + <div> + + <a href="http://www.sugarlabs.org/"> Web </a> · + <a href="http://wiki.sugarlabs.org/"> Wiki </a> · + <a href="http://activities.sugarlabs.org/"> Activities </a> · + <a href="http://planet.sugarlabs.org/"> Blog </a> · + <a href="http://lists.sugarlabs.org/"> Lists </a> · + <a href="http://chat.sugarlabs.org/"> Chat </a> · + <a href="http://meeting.sugarlabs.org/"> Meeting </a> · + <a href="http://bugs.sugarlabs.org/"> Bugs </a> · + <a href="http://git.sugarlabs.org/"> <i>Git</i> </a> · + <a href="http://translate.sugarlabs.org/"> Translate </a> · + <a href="http://download.sugarlabs.org/"> Archive </a> · + <a href="http://people.sugarlabs.org/"> People </a> · + <a href="http://sugarlabs.org/go/Sugar_Labs/Donate"><b>Donate</b></a> + </div> <% end -%> <ul id="user-nav"> <li><%= link_to("Dashboard", root_path) %></li> diff --git a/config/locales/en.rb b/config/locales/en.rb index 86a709c..bd14ef8 100644 --- a/config/locales/en.rb +++ b/config/locales/en.rb @@ -419,7 +419,7 @@ :branches => { :one => "branch", :other => "branches" }, :authors => { :one => "author", :other => "authors" }, :name => %Q{Name <small>(eg "%{name}-sandbox", "performance-fixes" etc)</small>}, - :btn_clone => "Clone repository", + :btn_clone => "Clone", :back => "Back to repository", :show_page_title => "%{repo} in %{title}", :show_title => ""%{repo}" repository in %{title}", diff --git a/config/locales/es.rb b/config/locales/es.rb index 1e7c9f5..4dbee55 100644 --- a/config/locales/es.rb +++ b/config/locales/es.rb @@ -270,7 +270,7 @@ :branches => { :one => "branch", :other => "branches" }, :authors => { :one => "autor", :other => "autores" }, :name => %Q{Nombre <small>(ej "%{name}-sandbox", "performance-fixes", etc)</small>}, - :btn_clone => "Clonar el repositorio", + :btn_clone => "Clonar", :back => "Volver al repositorio", :show_page_title => "%{repo} en %{title}", :show_title => "Repositorio "%{repo}" en %{title}", diff --git a/config/locales/fr.rb b/config/locales/fr.rb index 14fba67..58eb499 100644 --- a/config/locales/fr.rb +++ b/config/locales/fr.rb @@ -367,7 +367,7 @@ :branches => { :one => "branch", :other => "branches" }, :authors => { :one => "author", :other => "authors" }, :name => %Q{Name <small>(eg "{{name}}-sandbox", "performance-fixes" etc)</small>}, - :btn_clone => "Clone repository", + :btn_clone => "Clone", :back => "Back to repository", :show_page_title => "{{repo}} in {{title}}", :show_title => ""{{repo}}" repository in {{title}}", diff --git a/config/locales/pt-BR.rb b/config/locales/pt-BR.rb index 3fe3657..7e19c7e 100644 --- a/config/locales/pt-BR.rb +++ b/config/locales/pt-BR.rb @@ -372,7 +372,7 @@ :branches => { :one => "branch", :other => "branches" }, :authors => { :one => "autor", :other => "autores" }, :name => %Q{Nome <small>(ex "%{name}-sandbox", "conserto-performance" etc.)</small>}, - :btn_clone => "Clonar Repositório", + :btn_clone => "Clonar", :back => "Retornar ao Repositório", :show_page_title => "%{repo} em %{title}", :show_title => "repositório "%{repo}" em %{title}", diff --git a/data/hooks/post-commit b/data/hooks/post-commit index 8be6f34..8be6f34 100644..100755 --- a/data/hooks/post-commit +++ b/data/hooks/post-commit diff --git a/data/hooks/pre-applypatch b/data/hooks/pre-applypatch index 5f56ce8..5f56ce8 100644..100755 --- a/data/hooks/pre-applypatch +++ b/data/hooks/pre-applypatch diff --git a/data/hooks/pre-commit b/data/hooks/pre-commit index 4b9b551..4b9b551 100644..100755 --- a/data/hooks/pre-commit +++ b/data/hooks/pre-commit diff --git a/data/hooks/pre-rebase b/data/hooks/pre-rebase index e38f393..e38f393 100644..100755 --- a/data/hooks/pre-rebase +++ b/data/hooks/pre-rebase diff --git a/data/hooks/pre_receive_guard.rb b/data/hooks/pre_receive_guard.rb index ca83bc7..ca83bc7 100644..100755 --- a/data/hooks/pre_receive_guard.rb +++ b/data/hooks/pre_receive_guard.rb diff --git a/public/stylesheets/base.css b/public/stylesheets/base.css index dc03763..dcb7a7b 100644 --- a/public/stylesheets/base.css +++ b/public/stylesheets/base.css @@ -241,6 +241,7 @@ abbr.timeago { #user-nav { float: right; margin: -22px 15px 4px 0px; + position:relative; top:30px } #user-nav li { @@ -301,7 +302,7 @@ abbr.timeago { } #header #logo { - padding: 10px 0 0 20px; + padding: 0px 0 0 20px; line-height: 25px; margin: 25px 0px 0px 25px; float: left; |