ref: refs/heads/master
commit 3cab3e49bd7e06df3b80f26ca2d3f688621fca61
Author: Robert Lihm
Date: Wed Jul 15 13:29:53 2009 +0200
Cleaned up code and added 2 blank files for js and css
---
webclient/app/views/layouts/main.rhtml | 61 +++++++-------
webclient/public/javascripts/script.js | 3 +
webclient/public/stylesheets/style.css | 11 +++
webclient/public/stylesheets/yast.css | 146 +++++++++++++++++---------------
4 files changed, 123 insertions(+), 98 deletions(-)
diff --git a/webclient/app/views/layouts/main.rhtml b/webclient/app/views/layouts/main.rhtml
index 67c426d..06d30b9 100644
--- a/webclient/app/views/layouts/main.rhtml
+++ b/webclient/app/views/layouts/main.rhtml
@@ -3,55 +3,56 @@
<html>
<head xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
<meta http-equiv="Content-type" content="text/html; charset=utf-8" />
+
<link rel="stylesheet" href="/stylesheets/yast.css" type="text/css" media="screen" title="default" charset="utf-8" />
+ <link rel="stylesheet" href="/stylesheets/style.css" type="text/css" media="screen" title="default" charset="utf-8" />
<link rel="stylesheet" href="/stylesheets/jquery.jqplot.css" type="text/css" media="screen" title="default" charset="utf-8" />
-
<script type="text/javascript" language="javascript" charset="utf-8" src="/inc/jquery.js"></script>
- <script type="text/javascript" language="javascript" charset="utf-8" src="/inc/jquery.query.js"></script>
+ <script type="text/javascript" language="javascript" charset="utf-8" src="/inc/jquery.query.js"></script>
<script type="text/javascript" language="javascript" charset="utf-8" src="/inc/jquery.timers.js"></script>
<script type="text/javascript" language="javascript" charset="utf-8" src="/javascripts/jquery.jqplot.js"></script>
<script type="text/javascript" language="javascript" charset="utf-8" src="/javascripts/plugin/jqplot.pieRenderer.js"></script>
<script type="text/javascript" language="javascript" charset="utf-8" src="/inc/jquery.ui.custom.js"></script>
<!--<script type="text/javascript" language="javascript" charset="utf-8" src="/inc/jquery.jqModal.js"></script>
-<script type="text/javascript" language="javascript" charset="utf-8" src="/inc/jquery.ui.core.js"></script>
+ <script type="text/javascript" language="javascript" charset="utf-8" src="/inc/jquery.ui.core.js"></script>
<script type="text/javascript" language="javascript" charset="utf-8" src="/inc/jquery.ui.tabs.js"></script>-->
- <script type="text/javascript" language="javascript" charset="utf-8" src="/inc/shortcut.js"></script>
+ <script type="text/javascript" language="javascript" charset="utf-8" src="/inc/shortcut.js"></script>
<script type="text/javascript" language="javascript" charset="utf-8" src="/inc/yast.widgets.js"></script>
- <script type="text/javascript" language="javascript" charset="utf-8" src="/inc/yast.helpers.js"></script>
+ <script type="text/javascript" language="javascript" charset="utf-8" src="/inc/yast.helpers.js"></script>
+
<title>WebYaST</title>
</head>
<body id="shell" bgcolor="#ffffff" onload="">
<div id="appliance_logo">
<img src="/images/suse-logo.png" alt="SUSE" height="120" width="120" border="0" />
- <div id="appliance_title">My Appliance</div>
-
+ <div id="appliance_title">My Appliance</div>
+
<% host = Host.find(session[:host]) rescue nil
user = session[:user]
- if host.blank? || user.blank? -%>
-
- <div id="login_session">
- <%= link_to _("Login"), '/login' %>
- </div>
-
- <% else -%>
-
- <div id="logout_session">
- <div id="connectedHost">
- <div class="box">
- <p><%=_("Connected Host")%></p>
- <p><%=_("Name:")%> <%= host.name -%> <p>
- <%=_("User:")%> <%= user -%>
- </div>
- </div>
- <%= link_to _("Logout"), '/logout' %>
- </div>
-
- <% end -%>
-
- </div>
+ if host.blank? || user.blank? -%>
+
+ <div id="login_session">
+ <%= link_to _("Login"), '/login' %>
+ </div>
+
+ <% else -%>
+
+ <div id="logout_session">
+ <div id="connectedHost">
+ <div class="box">
+ <p><%=_("Connected Host")%></p>
+ <p><%=_("Name:")%> <%= host.name -%> <p>
+ <%=_("User:")%> <%= user -%>
+ </div>
+ </div>
+ <%= link_to _("Logout"), '/logout' %>
+ </div>
+ <% end -%>
+
+ </div>
<div class="content">
<!-- show the flash messages -->
@@ -73,4 +74,4 @@
<div class="copy">© 2009 Novell, Inc.</div>
</div>
</body>
-</html>
+</html>
\ No newline at end of file
diff --git a/webclient/public/javascripts/script.js b/webclient/public/javascripts/script.js
index e69de29..6d84c72 100644
--- a/webclient/public/javascripts/script.js
+++ b/webclient/public/javascripts/script.js
@@ -0,0 +1,3 @@
+$(document).ready(function() {
+ // Stuff to do as soon as the DOM is ready;
+});
diff --git a/webclient/public/stylesheets/style.css b/webclient/public/stylesheets/style.css
index e69de29..6ff61ea 100644
--- a/webclient/public/stylesheets/style.css
+++ b/webclient/public/stylesheets/style.css
@@ -0,0 +1,11 @@
+html,
+body {
+ background-color: #fcfcfc;
+ color: #333;
+ font: 0.8em "lsLucida Grande", "Trebuchet MS", Verdana, sans-serif;
+ width: 99%;
+ height: 99%;
+ margin: 0;
+ padding: 0;
+}
+
diff --git a/webclient/public/stylesheets/yast.css b/webclient/public/stylesheets/yast.css
index 49bab3b..cd1381b 100644
--- a/webclient/public/stylesheets/yast.css
+++ b/webclient/public/stylesheets/yast.css
@@ -1,30 +1,30 @@
#appliance_logo {
-position: absolute;
-left:50px;
-top:10px;
+ position: absolute;
+ left: 50px;
+ top: 10px;
}
#appliance_title {
-font-weight: bold;
-font-size:3.5em;
-position: fixed;
-top: 30px;
-left: 300px;
+ font-weight: bold;
+ font-size: 3.5em;
+ position: fixed;
+ top: 30px;
+ left: 300px;
}
#logout_session {
-position:fixed;
-right:50px;
-top:10px;
+ position: fixed;
+ right: 50px;
+ top: 10px;
}
#login_session {
-position:fixed;
-right:50px;
-top:10px;
+ position: fixed;
+ right: 50px;
+ top: 10px;
}
-.content {
+.content {
margin-left: 15.5em;
margin-top: 10em;
}
@@ -34,113 +34,123 @@ margin-top: 10em;
color: red;
}
-#status_patches_icon
-{
-margin-left: 2em;
+#status_patches_icon {
+ margin-left: 2em;
}
#status_patches_msg {
-margin-left: 5em;
-margin-top: -1.5em;
+ margin-left: 5em;
+ margin-top: -1.5em;
}
#status_health_icon {
-margin-left: 2em;
+ margin-left: 2em;
}
#status_health_msg {
-margin-left: 5em; margin-top: -1.5em;
+ margin-left: 5em;
+ margin-top: -1.5em;
}
#configuration_recent {
-margin-left: 2em; margin-top: 5em;
+ margin-left: 2em;
+ margin-top: 5em;
}
#link_showall {
-position:fixed;
-right:50px;
-margin-top: 1em;
+ position:fixed;
+ right:50px;
+ margin-top: 1em;
}
#configuration_network {
-background-color: #d3d3d3;
+ background-color: #d3d3d3;
}
#module_heading {
-font-size: 2em; font-weight: bold;
+ font-size: 2em;
+ font-weight: bold;
}
.module_heading {
-color: black; font-size: 1.5em; font-weight: bold
+ color: black;
+ font-size: 1.5em;
+ font-weight: bold
}
.module_heading img {
-vertical-align:middle;
+ vertical-align: middle;
}
#tab_heading {
- position: relative;
- width: 100%;
- height: 3em;
- width: 45em;
+ position: relative;
+ width: 100%;
+ height: 3em;
+ width: 45em;
}
#tab_heading ul#tab_nav {
- margin: 0;
- padding: 0;
- position: absolute;
- bottom: -1px;
- width: 45em;
+ margin: 0;
+ padding: 0;
+ position: absolute;
+ bottom: -1px;
+ width: 45em;
}
#tab_heading ul#tab_nav li {
- display: inline;
- list-style: none;
+ 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 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 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;
+ 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;
+ margin-top: 0;
+ border-color: #000000;
+ background: #c2c2c2;
+ padding-bottom: 5px;
}
th {
- background: #dddddd;
+ background: #dddddd;
}
table {
-margin-top: 5px;
+ margin-top: 5px;
}
a {
-color: #000000;
-text-decoration: none;
+ color: #000000;
+ text-decoration: none;
}
-a:hover
- { color: blue; text-decoration: underline }
\ No newline at end of file
+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
Robert Lihm