ref: refs/heads/master
commit 85226a5fa94b3f164591104e08b7a16cb0c3a7c5
Author: Robert Lihm
Date: Tue Nov 3 13:06:19 2009 +0100
* added 960 grid CSS
* added div-wrapper to mail module
---
.../app/views/mail_settings/index.html.erb | 7 ++++---
webclient/app/views/layouts/main.rhtml | 13 +++++++------
webclient/public/stylesheets/style.css | 17 +++++++++++++++--
3 files changed, 26 insertions(+), 11 deletions(-)
diff --git a/plugins/mail_settings/app/views/mail_settings/index.html.erb b/plugins/mail_settings/app/views/mail_settings/index.html.erb
index 8bb9793..cf5ca2b 100644
--- a/plugins/mail_settings/app/views/mail_settings/index.html.erb
+++ b/plugins/mail_settings/app/views/mail_settings/index.html.erb
@@ -1,5 +1,3 @@
-<div class='plugin-icon'><img src='/icons/yast-mail-server.png'/></div>
-
<% content_for :head do %>
<%= javascript_include_tag :defaults %>
@@ -29,9 +27,12 @@
</script>
<% end %>
-
+<!-- <div class='plugin-icon'><img src='/icons/yast-mail-server.png'/></div> -->
+<div class='plugin-icon'><img src='/icons/yast-mail-server.png'/></div>
<h2><%=_("Mail Settings")%></h2>
+<div class='plugin-content'>
+
<% disabled = ! @permissions[:write] %>
<fieldset id="" class="">
diff --git a/webclient/app/views/layouts/main.rhtml b/webclient/app/views/layouts/main.rhtml
index bd4ac28..a285c3f 100644
--- a/webclient/app/views/layouts/main.rhtml
+++ b/webclient/app/views/layouts/main.rhtml
@@ -4,6 +4,7 @@
<head>
<meta http-equiv="Content-type" content="text/html; charset=utf-8" />
<%= stylesheet_link_tag "yast", :title=>"default", :charset=>"utf-8" %>
+ <%= stylesheet_link_tag "grid", :title=>"default", :charset=>"utf-8" %>
<%= stylesheet_link_tag "style", :title=>"default", :charset=>"utf-8" %>
<%= stylesheet_link_tag "jquery.jqplot.css", :title=>"default", :charset=>"utf-8" %>
<%= stylesheet_link_tag "jquery-ui-1.7.2.custom.css", :title=>"default", :charset=>"utf-8" %>
@@ -61,10 +62,10 @@
</div>
</div>
- <div id="content" class="content">
+ <div id="content" class="container_12">
<!-- here both flash and dynamic notifications should be added -->
- <div id="flash-messages">
+ <div id="flash-messages" class="grid_12">
<div id="language_selection"></div>
<!-- show the flash messages -->
@@ -80,20 +81,20 @@
end
%>
- <div class="flash-message <%= flash_style %> ui-corner-all" style="margin-top: 20px; padding: .7em;">
- <p><span class="ui-icon <%= flash_icon %>" style="float: left; margin-right: .3em;"></span><strong><%= message %></strong></p>
+ <div class="flash-message <%= flash_style %> ui-corner-all grid_12">
+ <p><span class="ui-icon <%= flash_icon %>"></span><strong><%= message %></strong></p>
</div>
<% flash.delete flash_type -%>
<% end %>
</div> <!-- flash messages -->
- <div id="progress" style="display:none;">
+ <div id="progress" style="display: none;">
<%= image_tag("/images/working.gif") %><%=_("...Wait...")%>
</div>
<%= yield %>
</div>
- <div id="footer" class="">
+ <div id="footer" class="container_12">
<div class="copy">© 2009 Novell, Inc.</div>
</div>
diff --git a/webclient/public/stylesheets/style.css b/webclient/public/stylesheets/style.css
index ec1a2e7..5050f67 100644
--- a/webclient/public/stylesheets/style.css
+++ b/webclient/public/stylesheets/style.css
@@ -515,8 +515,12 @@ input[type="submit"] {
.plugin-content {
float: left;
width: 90%;
- padding-bottom:5em;
-}
+ padding-bottom: 5em;
+
+/* border-color: #FF0000 #00FF00 #0000FF;
+ border-style: solid;
+ border-width: 1px;
+*/}
select.aligned-inputs,
input.aligned-inputs {
@@ -561,3 +565,12 @@ th.checkbox {
#flash-messages {
margin-bottom: 1em;
}
+.flash-message {
+ margin-top: 20px;
+ padding: 0.7em;
+}
+
+.flash-message span {
+ float: left;
+ margin-right: 0.3em;
+}
--
To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org
For additional commands, e-mail: yast-commit+help@opensuse.org
