aboutsummaryrefslogtreecommitdiffstats
path: root/sonar-server
diff options
context:
space:
mode:
authorSimon Brandhof <simon.brandhof@gmail.com>2012-09-21 21:13:50 +0200
committerSimon Brandhof <simon.brandhof@gmail.com>2012-09-21 21:13:50 +0200
commit3ffdbd9e347ffc498f0559d0b1cf39b5c6bbac23 (patch)
tree7d4e945bb5641bd2df439377f60c8c6f705534db /sonar-server
parent3d4d6b562d77c7f644708a6bfa7bf97c84b117dc (diff)
downloadsonarqube-3ffdbd9e347ffc498f0559d0b1cf39b5c6bbac23.tar.gz
sonarqube-3ffdbd9e347ffc498f0559d0b1cf39b5c6bbac23.zip
Improve CSS
Diffstat (limited to 'sonar-server')
-rw-r--r--sonar-server/src/main/webapp/WEB-INF/app/views/dashboards/_available_dashboards.html.erb2
-rw-r--r--sonar-server/src/main/webapp/WEB-INF/app/views/dashboards/_my_dashboards.html.erb2
-rw-r--r--sonar-server/src/main/webapp/WEB-INF/app/views/layouts/_head.html.erb107
-rw-r--r--sonar-server/src/main/webapp/WEB-INF/app/views/profiles/_rename_form.html.erb6
-rw-r--r--sonar-server/src/main/webapp/WEB-INF/app/views/profiles/index.html.erb4
-rw-r--r--sonar-server/src/main/webapp/stylesheets/style.css6
6 files changed, 68 insertions, 59 deletions
diff --git a/sonar-server/src/main/webapp/WEB-INF/app/views/dashboards/_available_dashboards.html.erb b/sonar-server/src/main/webapp/WEB-INF/app/views/dashboards/_available_dashboards.html.erb
index ca88843c2cd..1146206e2fd 100644
--- a/sonar-server/src/main/webapp/WEB-INF/app/views/dashboards/_available_dashboards.html.erb
+++ b/sonar-server/src/main/webapp/WEB-INF/app/views/dashboards/_available_dashboards.html.erb
@@ -19,7 +19,7 @@
<tr id="dashboard-<%= dashboard.id -%>" class="<%= cycle('even', 'odd', :name => 'shared') -%>">
<td>
<%= link_to h(dashboard.name(true)), {:controller => :dashboard, :action => :index, :did => dashboard.id, :id => (params[:resource] unless dashboard.global?)},
- :id => "view-#{u dashboard.name}", :class => 'link-action' %>
+ :id => "view-#{u dashboard.name}" %>
<div class="description"><%= h dashboard.description -%></div>
</td>
<td class="shared">
diff --git a/sonar-server/src/main/webapp/WEB-INF/app/views/dashboards/_my_dashboards.html.erb b/sonar-server/src/main/webapp/WEB-INF/app/views/dashboards/_my_dashboards.html.erb
index f6cd8d762a1..193af39786f 100644
--- a/sonar-server/src/main/webapp/WEB-INF/app/views/dashboards/_my_dashboards.html.erb
+++ b/sonar-server/src/main/webapp/WEB-INF/app/views/dashboards/_my_dashboards.html.erb
@@ -18,7 +18,7 @@
<tr id="dashboard-<%= dashboard.id -%>" class="<%= cycle('even', 'odd', :name => 'dashboard') -%>">
<td>
<%= link_to h(dashboard.name(true)), {:controller => :dashboard, :action => :index, :did => dashboard.id, :id => (params[:resource] unless dashboard.global?)},
- :id => "view-#{u dashboard.name}", :class => 'link-action' %>
+ :id => "view-#{u dashboard.name}" %>
<div class="description"><%= h dashboard.description -%></div>
</td>
<td class="shared">
diff --git a/sonar-server/src/main/webapp/WEB-INF/app/views/layouts/_head.html.erb b/sonar-server/src/main/webapp/WEB-INF/app/views/layouts/_head.html.erb
index c2f6ada98e3..8ef39b808f0 100644
--- a/sonar-server/src/main/webapp/WEB-INF/app/views/layouts/_head.html.erb
+++ b/sonar-server/src/main/webapp/WEB-INF/app/views/layouts/_head.html.erb
@@ -1,50 +1,61 @@
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN">
-<html><head><meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
-<meta name="gwt:property" content="locale=<%= I18n.locale.to_s.gsub(/-/, '_') -%>">
-<meta http-equiv="X-UA-Compatible" content="IE=9">
-<link rel="shortcut icon" type="image/x-icon" href="<%= image_path('favicon.ico') -%>" />
-<%
- if @project
-%><link rel="alternate" title="Sonar Alerts on <%= @project.name -%>" href="<%= ApplicationController.root_context -%>/feeds/project/<%= @project.key -%>?category=<%= EventCategory::KEY_ALERT -%>" type="application/atom+xml">
-<%
- else
-%><link rel="alternate" title="Sonar Alerts" href="<%= ApplicationController.root_context -%>/feeds/projects/<%= EventCategory::KEY_ALERT -%>" type="application/atom+xml"><%
- end
+<html>
+<head>
+ <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
+ <meta name="gwt:property" content="locale=<%= I18n.locale.to_s.gsub(/-/, '_') -%>">
+ <meta http-equiv="X-UA-Compatible" content="IE=9">
+ <link rel="shortcut icon" type="image/x-icon" href="<%= image_path('favicon.ico') -%>"/>
+ <%
+ if @project
+ %>
+ <link rel="alternate" title="Sonar Alerts on <%= @project.name -%>" href="<%= ApplicationController.root_context -%>/feeds/project/<%= @project.key -%>?category=<%= EventCategory::KEY_ALERT -%>" type="application/atom+xml">
+ <%
+ else
+ %>
+ <link rel="alternate" title="Sonar Alerts" href="<%= ApplicationController.root_context -%>/feeds/projects/<%= EventCategory::KEY_ALERT -%>" type="application/atom+xml">
+ <%
+ end
- if @page_title
- title="Sonar - #{h(@page_title)}"
- elsif @project
- title="Sonar - #{h(@project.name)}"
- elsif @resource
- title="#{h(@resource.long_name)}"
- else
- title='Sonar'
- end
-%>
-<title><%= title -%></title>
-<% if ENV['RAILS_ENV'] == 'production'
-%><%= stylesheet_link_tag 'sonar', :media => 'all' -%><%= javascript_include_tag 'sonar'
--%><% else %>
-<%= stylesheet_link_tag 'yui-reset-font', :media => 'all' %>
-<%= stylesheet_link_tag 'select2', :media => 'all' %>
-<%= stylesheet_link_tag 'layout', :media => 'all' %>
-<%= stylesheet_link_tag 'jquery-ui', :media => 'all' %>
-<%= stylesheet_link_tag 'style', :media => 'all' %>
-<%= stylesheet_link_tag 'sonar-colorizer', :media => 'all' %>
-<%= stylesheet_link_tag 'dashboard', :media => 'all' %>
-<%= javascript_include_tag 'prototype' %>
-<%= javascript_include_tag 'scriptaculous' %>
-<%= javascript_include_tag 'tablekit' %>
-<%= javascript_include_tag 'jquery.min' %>
-<%= javascript_include_tag 'jquery-ui.min' %>
-<%= javascript_include_tag 'select2.min' %>
-<%= javascript_include_tag 'protovis' %>
-<%= javascript_include_tag 'protovis-sonar' %>
-<%= javascript_include_tag 'application' %>
-<%= javascript_include_tag 'dashboard' %>
-<%= javascript_include_tag 'duplication' %>
-<%= javascript_include_tag 'resource' %>
-<% end %>
-<!--[if lte IE 8]><%= javascript_include_tag 'protovis-msie' -%><![endif]-->
-<script>var baseUrl = '<%= ApplicationController.root_context -%>';var $j = jQuery.noConflict();<%= yield :javascript_header -%></script>
-</head><body> \ No newline at end of file
+ if @page_title
+ title="Sonar - #{h(@page_title)}"
+ elsif @project
+ title="Sonar - #{h(@project.name)}"
+ elsif @resource
+ title="#{h(@resource.long_name)}"
+ else
+ title='Sonar'
+ end
+ %>
+ <title><%= title -%></title>
+ <% if ENV['RAILS_ENV'] == 'production'
+ %>
+ <%= stylesheet_link_tag 'sonar', :media => 'all' -%>
+ <%= yield :css -%>
+ <%= javascript_include_tag 'sonar' -%>
+ <% else %>
+ <%= stylesheet_link_tag 'yui-reset-font', :media => 'all' %>
+ <%= stylesheet_link_tag 'select2', :media => 'all' %>
+ <%= stylesheet_link_tag 'layout', :media => 'all' %>
+ <%= stylesheet_link_tag 'jquery-ui', :media => 'all' %>
+ <%= stylesheet_link_tag 'style', :media => 'all' %>
+ <%= stylesheet_link_tag 'sonar-colorizer', :media => 'all' %>
+ <%= stylesheet_link_tag 'dashboard', :media => 'all' %>
+ <%= javascript_include_tag 'prototype' %>
+ <%= javascript_include_tag 'scriptaculous' %>
+ <%= javascript_include_tag 'tablekit' %>
+ <%= javascript_include_tag 'jquery.min' %>
+ <%= javascript_include_tag 'jquery-ui.min' %>
+ <%= javascript_include_tag 'select2.min' %>
+ <%= javascript_include_tag 'protovis' %>
+ <%= javascript_include_tag 'protovis-sonar' %>
+ <%= javascript_include_tag 'application' %>
+ <%= javascript_include_tag 'dashboard' %>
+ <%= javascript_include_tag 'duplication' %>
+ <%= javascript_include_tag 'resource' %>
+ <% end %>
+ <!--[if lte IE 8]><%= javascript_include_tag 'protovis-msie' -%><![endif]-->
+ <script>var baseUrl = '<%= ApplicationController.root_context -%>';
+ var $j = jQuery.noConflict();</script>
+ <%= yield :script -%>
+</head>
+<body> \ No newline at end of file
diff --git a/sonar-server/src/main/webapp/WEB-INF/app/views/profiles/_rename_form.html.erb b/sonar-server/src/main/webapp/WEB-INF/app/views/profiles/_rename_form.html.erb
index f64315285e5..d024b747940 100644
--- a/sonar-server/src/main/webapp/WEB-INF/app/views/profiles/_rename_form.html.erb
+++ b/sonar-server/src/main/webapp/WEB-INF/app/views/profiles/_rename_form.html.erb
@@ -1,4 +1,4 @@
-<h2 class="modal-title" xmlns="http://www.w3.org/1999/html">Rename Profile</h2>
+<h2 class="modal-title">Rename Profile: <%= h @profile.name -%></h2>
<form id="form-rename-profile" method="post" action="profiles/rename">
<input type="hidden" name="id" value="<%= @profile.id -%>"/>
@@ -8,10 +8,6 @@
<fieldset>
<div class="form-field">
- <label for="">Old name</label>
- <input type="text" disabled="disabled" value="<%= h @profile.name -%>"/>
- </div>
- <div class="form-field">
<label for="name">New name</label>
<input id="new-name" name="name" type="text"/>
</div>
diff --git a/sonar-server/src/main/webapp/WEB-INF/app/views/profiles/index.html.erb b/sonar-server/src/main/webapp/WEB-INF/app/views/profiles/index.html.erb
index e1e8e3bd93e..b69715c0791 100644
--- a/sonar-server/src/main/webapp/WEB-INF/app/views/profiles/index.html.erb
+++ b/sonar-server/src/main/webapp/WEB-INF/app/views/profiles/index.html.erb
@@ -158,8 +158,10 @@
<br/><br/>
<% end %>
-<% content_for :javascript_header do %>
+<% content_for :script do %>
+<script>
$j(document).ready(function () {
$j('.open-modal').modal();
});
+</script>
<% end %>
diff --git a/sonar-server/src/main/webapp/stylesheets/style.css b/sonar-server/src/main/webapp/stylesheets/style.css
index b628cbeffd2..565a81f3bfb 100644
--- a/sonar-server/src/main/webapp/stylesheets/style.css
+++ b/sonar-server/src/main/webapp/stylesheets/style.css
@@ -2368,13 +2368,13 @@ select.medium-width {
}
.form-footer {
text-align: right;
- padding: 0.5em;
+ padding: 4px 10px;
border-top: 1px solid #CCC;
}
.form-footer input {
margin-right: 10px;
}
input[type=text],input[type=password] {
- height: 20px;
- padding: 0 5px;
+ height: 18px;
+ padding: 0 3px;
}
generated by cgit v1.2.3 (git 2.39.1) at 2025-01-22 01:08:11 +0000