aboutsummaryrefslogtreecommitdiffstats
path: root/sonar-server/src
diff options
context:
space:
mode:
authorJulien HENRY <julien.henry@sonarsource.com>2013-07-04 17:12:16 +0200
committerJulien HENRY <julien.henry@sonarsource.com>2013-07-05 10:36:22 +0200
commit13ba053b40f214c5a1adfb45ee536d83f52e9f2a (patch)
tree93cd891a6ae6c740a08d64ae88e8a58eca74d98b /sonar-server/src
parentae4700caf7405693b000833ab00d8c2b4611609f (diff)
downloadsonarqube-13ba053b40f214c5a1adfb45ee536d83f52e9f2a.tar.gz
sonarqube-13ba053b40f214c5a1adfb45ee536d83f52e9f2a.zip
SONAR-4388 Move from Sonar to SonarQube
Diffstat (limited to 'sonar-server/src')
-rw-r--r--sonar-server/src/main/webapp/WEB-INF/app/views/backup/index.html.erb6
-rw-r--r--sonar-server/src/main/webapp/WEB-INF/app/views/feeds/projects.atom.builder4
-rw-r--r--sonar-server/src/main/webapp/WEB-INF/app/views/layouts/_head.html.erb6
-rw-r--r--sonar-server/src/main/webapp/WEB-INF/app/views/maintenance/index.html.erb4
-rw-r--r--sonar-server/src/main/webapp/WEB-INF/app/views/setup/migration_running.html.erb6
-rw-r--r--sonar-server/src/main/webapp/WEB-INF/app/views/updatecenter/_operations.html.erb4
-rw-r--r--sonar-server/src/main/webapp/WEB-INF/app/views/updatecenter/available.html.erb6
-rw-r--r--sonar-server/src/main/webapp/WEB-INF/app/views/updatecenter/system_updates.html.erb10
-rw-r--r--sonar-server/src/main/webapp/WEB-INF/app/views/updatecenter/updates.html.erb2
9 files changed, 24 insertions, 24 deletions
diff --git a/sonar-server/src/main/webapp/WEB-INF/app/views/backup/index.html.erb b/sonar-server/src/main/webapp/WEB-INF/app/views/backup/index.html.erb
index 159b416a128..0c68dcb4707 100644
--- a/sonar-server/src/main/webapp/WEB-INF/app/views/backup/index.html.erb
+++ b/sonar-server/src/main/webapp/WEB-INF/app/views/backup/index.html.erb
@@ -4,7 +4,7 @@
<div class="box">
<p>This will backup configuration in a portable XML format. Click on "backup" to download this file.</p>
- <p>You can use this backup to duplicate configuration to another Sonar instance. This backup includes global settings,
+ <p>You can use this backup to duplicate configuration to another SonarQube instance. This backup includes global settings,
custom metrics and quality profiles (coding rules, alerts).
</p>
<br/>
@@ -19,6 +19,6 @@
<% form_tag({:action => 'import'}, {:multipart => true}) do -%>
<%= file_field_tag 'file' %>
- <%= submit_tag 'Restore' %>
+ <%= submit_tag 'Restore' %>
<% end %>
-</div> \ No newline at end of file
+</div>
diff --git a/sonar-server/src/main/webapp/WEB-INF/app/views/feeds/projects.atom.builder b/sonar-server/src/main/webapp/WEB-INF/app/views/feeds/projects.atom.builder
index 24f4c628fc6..ebb787db113 100644
--- a/sonar-server/src/main/webapp/WEB-INF/app/views/feeds/projects.atom.builder
+++ b/sonar-server/src/main/webapp/WEB-INF/app/views/feeds/projects.atom.builder
@@ -1,5 +1,5 @@
atom_feed do |feed|
- feed.title("Sonar #{@category ? @category : 'all events'}")
+ feed.title("SonarQube #{@category ? @category : 'all events'}")
feed.updated(@date)
for event in @events
@@ -13,4 +13,4 @@ atom_feed do |feed|
end
end
end
-end \ No newline at end of file
+end
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 fbcd228b259..32a5f7bae82 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
@@ -8,11 +8,11 @@
<%
if @project
%>
- <link rel="alternate" title="Sonar Alerts on <%= h @project.name -%>" href="<%= ApplicationController.root_context -%>/feeds/project/<%= h @project.key -%>?category=<%= EventCategory::KEY_ALERT -%>" type="application/atom+xml">
+ <link rel="alternate" title="SonarQube Alerts on <%= h @project.name -%>" href="<%= ApplicationController.root_context -%>/feeds/project/<%= h @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">
+ <link rel="alternate" title="SonarQube Alerts" href="<%= ApplicationController.root_context -%>/feeds/projects/<%= EventCategory::KEY_ALERT -%>" type="application/atom+xml">
<%
end
@@ -63,4 +63,4 @@
</script>
<%= yield :script -%>
</head>
-<body> \ No newline at end of file
+<body>
diff --git a/sonar-server/src/main/webapp/WEB-INF/app/views/maintenance/index.html.erb b/sonar-server/src/main/webapp/WEB-INF/app/views/maintenance/index.html.erb
index 9d53fc266c0..5396c330d52 100644
--- a/sonar-server/src/main/webapp/WEB-INF/app/views/maintenance/index.html.erb
+++ b/sonar-server/src/main/webapp/WEB-INF/app/views/maintenance/index.html.erb
@@ -12,6 +12,6 @@
<div id="maintenance">
<div id="maintenancelogo"><a href="http://www.sonarsource.org"><%= image_tag('sonarqube-24x100.png', :class => 'png') -%></a></div>
-<h1>Sonar is under maintenance. <a href="<%= ApplicationController.root_context -%>/">Please check back later.</a></h1>
+<h1>SonarQube is under maintenance. <a href="<%= ApplicationController.root_context -%>/">Please check back later.</a></h1>
<p>Whilst waiting, you might want to check <a href="http://sonar-plugins.codehaus.org">new plugins</a> to extend the current functionality. </p><p>If you are an administrator and have no idea why this message is showing, you should read the <a href="http://docs.codehaus.org/display/SONAR/Upgrade+guide">upgrade guide</a>.</p>
-</div> \ No newline at end of file
+</div>
diff --git a/sonar-server/src/main/webapp/WEB-INF/app/views/setup/migration_running.html.erb b/sonar-server/src/main/webapp/WEB-INF/app/views/setup/migration_running.html.erb
index e8370fac6bb..70bd081a208 100644
--- a/sonar-server/src/main/webapp/WEB-INF/app/views/setup/migration_running.html.erb
+++ b/sonar-server/src/main/webapp/WEB-INF/app/views/setup/migration_running.html.erb
@@ -1,13 +1,13 @@
<meta http-equiv='refresh' content='5;'>
-<%
+<%
start_time = DatabaseMigrationManager.instance.migration_start_time
%>
<div class="admin migration" style="padding:10px">
<%= image_tag 'loading.gif' -%>
- <b>Sonar Database is currently upgrading.</b>
+ <b>SonarQube Database is currently upgrading.</b>
<br/>
<br/>
Started <%= distance_of_time_in_words(start_time, Time.now) -%> ago (<%= l start_time -%>)
-</div> \ No newline at end of file
+</div>
diff --git a/sonar-server/src/main/webapp/WEB-INF/app/views/updatecenter/_operations.html.erb b/sonar-server/src/main/webapp/WEB-INF/app/views/updatecenter/_operations.html.erb
index 1236878d716..71f72fdf538 100644
--- a/sonar-server/src/main/webapp/WEB-INF/app/views/updatecenter/_operations.html.erb
+++ b/sonar-server/src/main/webapp/WEB-INF/app/views/updatecenter/_operations.html.erb
@@ -11,7 +11,7 @@
<% if @uninstalls.size > 0 %>
<form action="<%= ApplicationController.root_context -%>/updatecenter/cancel_uninstalls" method="post" class="warning">
-<p>Sonar needs to be restarted in order to uninstall the following plugins: <ul>
+<p>SonarQube needs to be restarted in order to uninstall the following plugins: <ul>
<% @uninstalls.each do |uninstall| %>
<li><%= uninstall -%></li>
<% end %>
@@ -23,7 +23,7 @@
<% if @downloads.size > 0 %>
<form action="<%= ApplicationController.root_context -%>/updatecenter/cancel_downloads" method="post" class="warning">
-<p>Sonar needs to be restarted in order to install the following plugins: <ul>
+<p>SonarQube needs to be restarted in order to install the following plugins: <ul>
<% @downloads.each do |download| %>
<li><%= download -%></li>
<% end %>
diff --git a/sonar-server/src/main/webapp/WEB-INF/app/views/updatecenter/available.html.erb b/sonar-server/src/main/webapp/WEB-INF/app/views/updatecenter/available.html.erb
index 9f0dc4ce357..54a09db5d68 100644
--- a/sonar-server/src/main/webapp/WEB-INF/app/views/updatecenter/available.html.erb
+++ b/sonar-server/src/main/webapp/WEB-INF/app/views/updatecenter/available.html.erb
@@ -7,7 +7,7 @@ function installPlugin(key) {
return false;
}
$('install-form-' + key).submit();
-
+
var button=$('submit-' + key);
button.disable();
button.writeAttribute('value', 'Installing');
@@ -111,13 +111,13 @@ function installPlugin(key) {
%>
<tr>
<td class="thin nowrap"><b>Last version:</b> </td>
- <td><%= update.getRelease().getVersion() -%> (<%= image_tag 'warning.png' -%> Not compatible, requires Sonar upgrade)</td>
+ <td><%= update.getRelease().getVersion() -%> (<%= image_tag 'warning.png' -%> Not compatible, requires SonarQube upgrade)</td>
</tr>
<% elsif update.requiresSonarUpgradeForDependencies
%>
<tr>
<td class="thin nowrap"><b>Last version:</b> </td>
- <td><%= update.getRelease().getVersion() -%> (<%= image_tag 'warning.png' -%> Not compatible, some dependencies requires Sonar upgrade)</td>
+ <td><%= update.getRelease().getVersion() -%> (<%= image_tag 'warning.png' -%> Not compatible, some dependencies requires SonarQube upgrade)</td>
</tr>
<%
end
diff --git a/sonar-server/src/main/webapp/WEB-INF/app/views/updatecenter/system_updates.html.erb b/sonar-server/src/main/webapp/WEB-INF/app/views/updatecenter/system_updates.html.erb
index e77bf8d7b11..49168f4f386 100644
--- a/sonar-server/src/main/webapp/WEB-INF/app/views/updatecenter/system_updates.html.erb
+++ b/sonar-server/src/main/webapp/WEB-INF/app/views/updatecenter/system_updates.html.erb
@@ -40,7 +40,7 @@
<table class="data width100" id="sonar-<%= release.getVersion() -%>">
<thead>
<tr>
- <th><h2>Sonar <%= release.getVersion() -%></h2></th>
+ <th><h2>SonarQube <%= release.getVersion() -%></h2></th>
</tr>
</thead>
<tbody>
@@ -64,7 +64,7 @@
<td class="sep"></td>
<td>
<% if update.hasWarnings() %>
- Follow those steps to upgrade Sonar from version <%= sonar_version -%> to
+ Follow those steps to upgrade SonarQube from version <%= sonar_version -%> to
version <%= release.getVersion() -%> :
<ol class="bulletpoints">
<% update.getIncompatiblePlugins().each do |incompatible_plugin| %>
@@ -73,7 +73,7 @@
<%= image_tag 'warning.png' -%>
<input type="submit" value="Uninstall" class="red-button" onClick="return submitForm(this);"/>
the plugin <%= incompatible_plugin.getName() -%> which is not compatible with
- Sonar <%= release.getVersion() -%>.
+ SonarQube <%= release.getVersion() -%>.
</form>
</li>
<% end %>
@@ -88,14 +88,14 @@
<% end %>
<li>Stop Sonar</li>
<li><%= link_to 'Download', release.getDownloadUrl(), :class => 'external' -%> and install
- Sonar <%= release.getVersion() -%> after having carefully read the upgrade guide.
+ SonarQube <%= release.getVersion() -%> after having carefully read the upgrade guide.
</li>
<li>Start Sonar</li>
</ol>
<% else %>
<%= link_to 'Download', release.getDownloadUrl(), :class => 'external' -%> and install
- Sonar <%= release.getVersion() -%> after having carefully read the upgrade guide.
+ SonarQube <%= release.getVersion() -%> after having carefully read the upgrade guide.
<% end %>
</td>
</tr>
diff --git a/sonar-server/src/main/webapp/WEB-INF/app/views/updatecenter/updates.html.erb b/sonar-server/src/main/webapp/WEB-INF/app/views/updatecenter/updates.html.erb
index 2808195e612..de67cfb9d70 100644
--- a/sonar-server/src/main/webapp/WEB-INF/app/views/updatecenter/updates.html.erb
+++ b/sonar-server/src/main/webapp/WEB-INF/app/views/updatecenter/updates.html.erb
@@ -43,7 +43,7 @@ function upgradePlugin(key) {
<% elsif update.requiresSonarUpgrade %>
<%= image_tag 'warning.png' -%> Incompatible, requires to upgrade system
<% elsif update.requiresSonarUpgradeForDependencies %>
- <%= image_tag 'warning.png' -%> Incompatible, some dependencies requires Sonar upgrade
+ <%= image_tag 'warning.png' -%> Incompatible, some dependencies requires SonarQube upgrade
<% end %>
</td>
</tr>
generated by cgit v1.2.3 (git 2.39.1) at 2025-01-30 20:03:01 +0000