ref: refs/heads/master
commit 038e7ab745317e6663b9d23076bd7d8e9ac02b25
Author: Robert Lihm
Date: Mon Nov 2 16:43:28 2009 +0100
fixed position of #footer in DOM.
---
plugins/network/app/views/network/index.html.erb | 21 ---------------------
webclient/app/views/layouts/main.rhtml | 14 ++++++--------
webclient/public/stylesheets/style.css | 4 ++--
3 files changed, 8 insertions(+), 31 deletions(-)
diff --git a/plugins/network/app/views/network/index.html.erb b/plugins/network/app/views/network/index.html.erb
index 6460e40..87e97cb 100644
--- a/plugins/network/app/views/network/index.html.erb
+++ b/plugins/network/app/views/network/index.html.erb
@@ -147,25 +147,4 @@
})
<% end -%>
-<!-- <div id="tabs">
- <ul>
- <li><a href="#fragment-1"><span>One</span></a></li>
- <li><a href="#fragment-2"><span>Two</span></a></li>
- <li><a href="#fragment-3"><span>Three</span></a></li>
- </ul>
- <div id="fragment-1">
- <p>First tab is active by default:</p>
- <pre><code>$('#example').tabs();</code></pre>
- </div>
- <div id="fragment-2">
- Lorem ipsum dolor sit amet, consectetuer adipiscing elit, sed diam nonummy nibh euismod tincidunt ut laoreet dolore magna aliquam erat volutpat.
- Lorem ipsum dolor sit amet, consectetuer adipiscing elit, sed diam nonummy nibh euismod tincidunt ut laoreet dolore magna aliquam erat volutpat.
- </div>
- <div id="fragment-3">
- Lorem ipsum dolor sit amet, consectetuer adipiscing elit, sed diam nonummy nibh euismod tincidunt ut laoreet dolore magna aliquam erat volutpat.
- Lorem ipsum dolor sit amet, consectetuer adipiscing elit, sed diam nonummy nibh euismod tincidunt ut laoreet dolore magna aliquam erat volutpat.
- Lorem ipsum dolor sit amet, consectetuer adipiscing elit, sed diam nonummy nibh euismod tincidunt ut laoreet dolore magna aliquam erat volutpat.
- </div>
-</div> -->
-
diff --git a/webclient/app/views/layouts/main.rhtml b/webclient/app/views/layouts/main.rhtml
index 694e968..bd4ac28 100644
--- a/webclient/app/views/layouts/main.rhtml
+++ b/webclient/app/views/layouts/main.rhtml
@@ -60,15 +60,14 @@
<% end -%>
</div>
</div>
-
+
<div id="content" class="content">
-
-
+
<!-- here both flash and dynamic notifications should be added -->
<div id="flash-messages">
- <div id="language_selection"/>
+ <div id="language_selection"></div>
<!-- show the flash messages -->
-
+
<% flash.each do |flash_type, message| %>
<%
flash_icon = case flash_type
@@ -80,14 +79,13 @@
else "ui-state-highlight"
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>
<% flash.delete flash_type -%>
<% end %>
</div> <!-- flash messages -->
-<br/>
<div id="progress" style="display:none;">
<%= image_tag("/images/working.gif") %><%=_("...Wait...")%>
</div>
@@ -97,7 +95,7 @@
<div id="footer" class="">
<div class="copy">© 2009 Novell, Inc.</div>
-
</div>
+
</body>
</html>
diff --git a/webclient/public/stylesheets/style.css b/webclient/public/stylesheets/style.css
index f5db94f..051454b 100644
--- a/webclient/public/stylesheets/style.css
+++ b/webclient/public/stylesheets/style.css
@@ -127,8 +127,8 @@ ul li {
margin-bottom: 1.5em;
}
#footer {
- padding: 1em 0 100px;
- border-top: 1px dotted #ccc;
+ padding: 1em 0;
+/* border-top: 1px dotted #ccc;*/
}
/* == Basic Styles ======================================================== */
--
To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org
For additional commands, e-mail: yast-commit+help@opensuse.org
