ref: refs/heads/master
commit bc817b559c47080837afa9edac346e5f33ca4b83
Author: Stefan Schubert
Date: Mon Jul 6 10:27:36 2009 +0200
adapt to new layout
---
webclient/app/views/layouts/main.rhtml | 23 ++++++++++++++---------
webclient/app/views/webservices/index.rhtml | 3 +--
webclient/public/stylesheets/yast.css | 2 +-
3 files changed, 16 insertions(+), 12 deletions(-)
diff --git a/webclient/app/views/layouts/main.rhtml b/webclient/app/views/layouts/main.rhtml
index b74e080..996eb63 100644
--- a/webclient/app/views/layouts/main.rhtml
+++ b/webclient/app/views/layouts/main.rhtml
@@ -24,27 +24,32 @@
<div id="appliance_logo">
<img src="/images/suse-logo.png" alt="" height="120" width="120" border="0">
<div id="appliance_title">My Appliance</div>
- <div id="logout">
+ <% host = session[:host]
+ if host != nil && !host.blank? %>
+ <div id="logout_session">
<div id="connectedHost">
- <% host = session[:host]
- if host!=nil && host!=""
- if host.index("://") != nil
+ <% if host.index("://") != nil
host = host[host.index("://")+3, host.length-1] #extract "http(s)://"
end -%>
- <% user = session[:user] -%>
- <div class="box">
+ <% user = session[:user] -%>
+ <div class="box">
<p><%=_("Connected Host")%></p>
<p><%=_("Name:")%> <%= host -%> <p>
<%=_("User:")%> <%= user -%>
- </div>
- <% end -%>
+ </div>
</div>
<% user = session[:user] %>
<% if user %>
<%= link_to _("Logout"), '/logout' %>
<% end %>
- </div>
+ </div>
+ <% elsif controller_name != "sessions" && controller_name != "webservices" -%>
+ <div id="login_session">
+ <%= link_to _("Login"), '/logout' %>
+ </div>
+ <% end -%>
+
</div>
<div class="content">
diff --git a/webclient/app/views/webservices/index.rhtml b/webclient/app/views/webservices/index.rhtml
index 679a633..b7f18cb 100644
--- a/webclient/app/views/webservices/index.rhtml
+++ b/webclient/app/views/webservices/index.rhtml
@@ -1,7 +1,7 @@
<div class="services-list">
- <label for="#services-list">Systems list</label>
+ <label for="#services-list">Please choose a service:</label>
<table id="services-list" class="list">
<tbody>
<% for webservice in @webservices %>
@@ -36,5 +36,4 @@
</div>
<!-- webservices list -->
-<a href="/" class="button"><%=_("Back")%></a>
diff --git a/webclient/public/stylesheets/yast.css b/webclient/public/stylesheets/yast.css
index 215e252..18887ae 100644
--- a/webclient/public/stylesheets/yast.css
+++ b/webclient/public/stylesheets/yast.css
@@ -1 +1 @@
-#appliance_logo {
position: absolute;
left:50px;
top:10px;
}
#appliance_title {
font-weight: bold;
font-size:3.5em;
position: fixed;
top: 30px;
left: 300px;
}
#logout {
position:fixed;
right:50px;
top:10px;
}
.content {
margin-left: 15.5em;
margin-top: 2em;
}
#status_patches_icon
{
margin-left: 2em;
}
#status_patches_msg {
margin-left: 5em;
margin-top: -1.5em;
}
#status_health_icon {
margin-left: 2em;
}
#status_health_msg {
margin-left: 5em; margin-top: -1.5em;
}
#configuration_recent {
margin-left: 2em; margin-top: 5em;
}
#link_showall {
position:fixed;
right:50px;
margin-top: 1em;
}
#configuration_network {
background-color: #d3d3d3;
}
#module_heading {
font-size: 2em; font-weight: bold;
}
.module_heading {
color: black; font-size: 1.5em; font-weight: bold
}
.module_heading img {
vertical-align:middle;
}
#tab_heading {
position: relative;
width: 100%;
height: 3em;
width: 45em;
}
#tab_heading ul#tab_nav {
margin: 0;
padding: 0;
position: absolute;
bottom: -1px;
width: 45em;
}
#tab_heading ul#tab_nav li {
display: inline;
list-style: none;
}
#tab_heading ul#tab_nav a,#tab_heading ul#tab_nav span,#tab_heading ul#tab_nav a.current {
width: 8em;
display: block;
float: left;
padding: 5px 0;
margin: 1px 3px 0 0;
text-align: center;
text-decoration: none;
color: #000000;
}
#tab_heading ul#tab_nav span,#tab_heading ul#tab_nav a.current,#tab_heading ul#tab_nav a.current:hover {
border: 1px solid #000000;
border-bottom: none;
padding-bottom: 6px;
margin-top: 0;
}
#tab_heading ul#tab_nav a {
background: #d3d3d3;
border: 1px solid #000000;
border-bottom: none;
}
#tab_heading ul#tab_nav a:hover {
margin-top: 0;
border-color: #000000;
background: #c2c2c2;
padding-bottom: 5px;
}
th {
background: #dddddd;
}
table {
margin-top: 5px;
}
a {
color: #000000;
text-decoration: none;
}
a:hover
{ color: blue; text-decoration: underline }
\ No newline at end of file
+#appliance_logo {
position: absolute;
left:50px;
top:10px;
}
#appliance_title {
font-weight: bold;
font-size:3.5em;
position: fixed;
top: 30px;
left: 300px;
}
#logout_session {
position:fixed;
right:50px;
top:10px;
}
#login_session {
position:fixed;
right:50px;
top:10px;
}
.content {
margin-left: 15.5em;
margin-top: 10em;
}
#status_patches_icon
{
margin-left: 2em;
}
#status_patches_msg {
margin-left: 5em;
margin-top: -1.5em;
}
#status_health_icon {
margin-left: 2em;
}
#status_health_msg {
margin-left: 5em; margin-top: -1.5em;
}
#configuration_recent {
margin-left: 2em; margin-top: 5em;
}
#link_showall {
position:fixed;
right:50px;
margin-top: 1em;
}
#configuration_network {
background-color: #d3d3d3;
}
#module_heading {
font-size: 2em; font-weight: bold;
}
.module_heading {
color: black; font-size: 1.5em; font-weight: bold
}
.module_heading img {
vertical-align:middle;
}
#tab_heading {
position: relative;
width: 100%;
height: 3em;
width: 45em;
}
#tab_heading ul#tab_nav {
margin: 0;
padding: 0;
position: absolute;
bottom: -1px;
width: 45em;
}
#tab_heading ul#tab_nav li {
display: inline;
list-style: none;
}
#tab_heading ul#tab_nav a,#tab_heading ul#tab_nav span,#tab_heading ul#tab_nav a.current {
width: 8em;
display: block;
float: left;
padding: 5px 0;
margin: 1px 3px 0 0;
text-align: center;
text-decoration: none;
color: #000000;
}
#tab_heading ul#tab_nav span,#tab_heading ul#tab_nav a.current,#tab_heading ul#tab_nav a.current:hover {
border: 1px solid #000000;
border-bottom: none;
padding-bottom: 6px;
margin-top: 0;
}
#tab_heading ul#tab_nav a {
background: #d3d3d3;
border: 1px solid #000000;
border-bottom: none;
}
#tab_heading ul#tab_nav a:hover {
margin-top: 0;
border-color: #000000;
background: #c2c2c2;
padding-bottom: 5px;
}
th {
background: #dddddd;
}
table {
margin-top: 5px;
}
a {
color: #000000;
text-decoration: none;
}
a:hover
{ color: blue; text-decoration: underline }
\ No newline at end of file
--
To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org
For additional commands, e-mail: yast-commit+help@opensuse.org
