ref: refs/heads/master
commit 9bbe6fc5d84ac819ba5d661afde926267e7d5339
Author: Martin Kudlvasr
Date: Thu Jul 23 17:13:28 2009 +0200
added appropriate icon to every plugin page
unified header level (=> h2) on all plugin pages
---
plugins/language/app/views/language/index.rhtml | 6 ++++--
plugins/network/app/views/network/index.html.erb | 5 ++++-
.../app/views/patch_updates/index.html.erb | 8 ++++++--
.../permissions/app/views/permissions/index.rhtml | 7 ++++++-
.../app/views/samba_server/index.html.erb | 6 +++++-
plugins/securities/app/views/securities/create.erb | 5 ++++-
plugins/securities/app/views/securities/update.erb | 4 ++++
plugins/services/app/views/services/index.rhtml | 7 ++++++-
plugins/status/app/views/status/index.html.erb | 6 ++++--
.../systemtime/app/views/system_time/index.rhtml | 7 +++++--
plugins/users/app/views/users/index.html.erb | 8 +++++++-
webclient/public/stylesheets/style.css | 10 ++++++++++
12 files changed, 65 insertions(+), 14 deletions(-)
diff --git a/plugins/language/app/views/language/index.rhtml b/plugins/language/app/views/language/index.rhtml
index 61c0206..26f88e1 100644
--- a/plugins/language/app/views/language/index.rhtml
+++ b/plugins/language/app/views/language/index.rhtml
@@ -1,4 +1,6 @@
-<h1><%=_("Language")%></h1>
+<div class='plugin-icon'><img src='/icons/yast-language.png'/></div>
+<div class='plugin-content'>
+<h2><%=_("Language")%></h2>
<br/>
<% form_tag '/language/commit_language' do -%>
@@ -30,7 +32,7 @@
<%= submit_tag _("Save"), :disabled=>!@permissions[:write] %>
</div>
<% end -%>
-
+</div>
diff --git a/plugins/network/app/views/network/index.html.erb b/plugins/network/app/views/network/index.html.erb
index 8531653..2934f1a 100644
--- a/plugins/network/app/views/network/index.html.erb
+++ b/plugins/network/app/views/network/index.html.erb
@@ -1,4 +1,6 @@
-<h1><%=_("Network Device")%></h1>
+<div class='plugin-icon'><img src='/icons/yast-network.png'/></div>
+<div class='plugin-content'>
+<h2><%=_("Network Device")%></h2>
<table class="list">
<tr>
@@ -14,4 +16,5 @@
<a href="/" class="button"><%=_("Back")%></a>
+</div>
diff --git a/plugins/patch_updates/app/views/patch_updates/index.html.erb b/plugins/patch_updates/app/views/patch_updates/index.html.erb
index d961632..7a6a9db 100644
--- a/plugins/patch_updates/app/views/patch_updates/index.html.erb
+++ b/plugins/patch_updates/app/views/patch_updates/index.html.erb
@@ -15,7 +15,9 @@
option[value=optional]:before { content:url('/icons/kupdateapplet_optional.png'); }
</style>
-
+ <div class='plugin-icon'><img src='/icons/yast-online_update.png'/></div>
+ <div class='plugin-content'>
+ <h2>Updates</h2>
<div class="loading"></div>
<% if @patch_updates.empty? %>
<p><%=_("Your system is up to date.") %></p>
@@ -39,6 +41,7 @@
<%= submit_tag _("Update"), :onclick=>"Element.show('progress')", :action => 'install', :class => 'button' -%>
<a href="/" class="button"><%=_("Back")%></a>
<% end %>
+ </div>
<% end %>
@@ -48,4 +51,5 @@
:url => { :action => :load_filtered },
:with => "'value=' + value"
)
-%>
\ No newline at end of file
+%>
+
diff --git a/plugins/permissions/app/views/permissions/index.rhtml b/plugins/permissions/app/views/permissions/index.rhtml
index c3c7d39..1febec9 100644
--- a/plugins/permissions/app/views/permissions/index.rhtml
+++ b/plugins/permissions/app/views/permissions/index.rhtml
@@ -44,7 +44,10 @@
<link rel="stylesheet" href="/inc/checktree/checktree.css" type="text/css" media="screen" title="default" charset="utf-8" />
</head>
-<h1><%=_("User Permissions")%></h1>
+<div class='plugin-icon'><img src='/icons/yast-security.png'/></div>
+<div class='plugin-content'>
+
+<h2><%=_("User Permissions")%></h2>
<br>
<% form_tag '/permissions/search' do %>
<p><label for="user"><%=_("User")%></label>
@@ -157,4 +160,6 @@
</table>
<% end %>
<% end %>
+</div>
</html>
+
diff --git a/plugins/samba_server/app/views/samba_server/index.html.erb b/plugins/samba_server/app/views/samba_server/index.html.erb
index 17692e5..fed4065 100644
--- a/plugins/samba_server/app/views/samba_server/index.html.erb
+++ b/plugins/samba_server/app/views/samba_server/index.html.erb
@@ -1,3 +1,7 @@
-<h1><%=_("Exported Samba Shares")%></h1>
+<div class='plugin-icon'><img src='/icons/yast-online_update.png'/></div>
+<div class='plugin-content'>
+<h2><%=_("Exported Samba Shares")%></h2>
<%= html_simple_table([_("Samba Shares")], @shares, [:id], {:add => @permissions[:addshare], :edit => @permissions[:editshare], :delete => @permissions[:deleteshare], :id => :id})%>
+</div>
+
diff --git a/plugins/securities/app/views/securities/create.erb b/plugins/securities/app/views/securities/create.erb
index d1c99e0..57778f3 100644
--- a/plugins/securities/app/views/securities/create.erb
+++ b/plugins/securities/app/views/securities/create.erb
@@ -1,3 +1,6 @@
+<div class='plugin-icon'><img src='/icons/yast-security.png'/></div>
+<div class='plugin-content'>
+
<h2><%=_("Security")%></h2>
<% form_tag '/security/update' do %>
@@ -29,4 +32,4 @@
</span>
</span>
<% end %>
-
+</div>
diff --git a/plugins/securities/app/views/securities/update.erb b/plugins/securities/app/views/securities/update.erb
index 4b46f99..b408dd6 100644
--- a/plugins/securities/app/views/securities/update.erb
+++ b/plugins/securities/app/views/securities/update.erb
@@ -1,3 +1,6 @@
+<div class='plugin-icon'><img src='/icons/yast-security.png'/></div>
+<div class='plugin-content'>
+
<h2><%=_("Security")%></h2>
<% form_tag '/security/update' do %>
@@ -29,3 +32,4 @@
</span>
<% end %>
+</div>
diff --git a/plugins/services/app/views/services/index.rhtml b/plugins/services/app/views/services/index.rhtml
index 06e3cb1..c3d63d8 100644
--- a/plugins/services/app/views/services/index.rhtml
+++ b/plugins/services/app/views/services/index.rhtml
@@ -33,7 +33,10 @@
</div>
<!-- end: dialog box -->
-<h1><%=_("Services")%></h1>
+<div class='plugin-icon'><img src='/icons/yast-online_update.png'/></div>
+<div class='plugin-content'>
+
+<h2><%=_("Services")%></h2>
<br>
<% if ! @permissions[:execute] %>
@@ -65,3 +68,5 @@
</li>
<% end %>
</ul>
+
+</div>
diff --git a/plugins/status/app/views/status/index.html.erb b/plugins/status/app/views/status/index.html.erb
index 12db9d1..586aca4 100644
--- a/plugins/status/app/views/status/index.html.erb
+++ b/plugins/status/app/views/status/index.html.erb
@@ -1,5 +1,6 @@
-
-<h1>Status</h1>
+<div class='plugin-icon'><img src='/images/monitoring.png'/></div>
+<div class='plugin-content'>
+<h2>Status</h2>
<% column = 1 %>
<% @data_group.keys.sort.each do |key| %>
@@ -39,6 +40,7 @@
<br>
<%= button_to _("Back"), :back %>
<br>
+</div>
<script type="text/javascript">
diff --git a/plugins/systemtime/app/views/system_time/index.rhtml b/plugins/systemtime/app/views/system_time/index.rhtml
index d334b31..55909ad 100644
--- a/plugins/systemtime/app/views/system_time/index.rhtml
+++ b/plugins/systemtime/app/views/system_time/index.rhtml
@@ -11,7 +11,8 @@
<% disabled = ! @permissions[:write] %>
-
+ <div class='plugin-icon'><img src='/icons/yast-ntp-client.png'/></div>
+ <div class='plugin-content'>
<h2><%=_("Configure timezone")%></h2>
<% form_tag '/system_time/update_timezone', :class => 'container' do %>
">
@@ -108,10 +109,12 @@
</tr>
</table>
<% end %>
+ </div>
<%= observe_field(:region,
:frequency => 0.25,
:update => :timezones,
:url => { :action => :timezones_for_region },
:with => "'disabled=' + "+ (disabled ? "true":"false")+" + '&value=' +value") %>
-<% end %>
\ No newline at end of file
+<% end %>
+
diff --git a/plugins/users/app/views/users/index.html.erb b/plugins/users/app/views/users/index.html.erb
index 8fbdb89..912ccad 100644
--- a/plugins/users/app/views/users/index.html.erb
+++ b/plugins/users/app/views/users/index.html.erb
@@ -1,4 +1,7 @@
-<h1><%=_("Local User")%></h1>
+<div class='plugin-icon'><img src='/icons/yast-users.png'/></div>
+<div class='plugin-content'>
+
+<h2><%=_("Local User")%></h2>
<table class="list">
<tr>
@@ -28,3 +31,6 @@
<% end %>
<a href="/" class="button"><%=_("Back")%></a>
+
+</div>
+
diff --git a/webclient/public/stylesheets/style.css b/webclient/public/stylesheets/style.css
index 174a7ce..e91bde2 100644
--- a/webclient/public/stylesheets/style.css
+++ b/webclient/public/stylesheets/style.css
@@ -400,3 +400,13 @@ input.button {
.alt-bg {
background-color: #f9f9f9;
}
+
+.plugin-icon {
+ float: left;
+ margin: 1em;
+}
+
+.plugin-content {
+ float: left;
+ width: 90%;
+}
--
To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org
For additional commands, e-mail: yast-commit+help@opensuse.org
