diff options
| -rw-r--r-- | module/web/static/css/default/style.css | 57 | ||||
| -rw-r--r-- | module/web/templates/default/base.html | 44 |
2 files changed, 55 insertions, 46 deletions
diff --git a/module/web/static/css/default/style.css b/module/web/static/css/default/style.css index 0385af496..f882e4a43 100644 --- a/module/web/static/css/default/style.css +++ b/module/web/static/css/default/style.css @@ -130,47 +130,34 @@ header .logo { font-family: SansationRegular, sans-serif;
}
.header_icon {
+ padding-top: 2px;
padding-bottom: 5px;
- padding-left: 24px;
+ padding-left: 25px;
height: 20px;
}
-.header_icon img {
- margin-bottom: -4px;
- padding-right: 5px;
-}
-
-.header_block {
- float: right;
- margin: 12px 12px 0;
- font-family: SansationRegular, sans-serif;
-}
.header_text {
- vertical-align: middle;
-}
-#header_div_logout {
- text-align: center;
- padding-left: 2px;
-}
-#header_div_user {
- background: url("../../img/default/icon_user_small_white.png")no-repeat;
-}
-#header_div_speed {
- background: url("../../img/default/icon_speed_small_white.png")no-repeat;
-}
-#header_div_downloads{
- background: url("../../img/default/icon_clock_small_white.png")no-repeat;
+ text-align: center;
}
+.icon_info img {
+ margin-bottom: -4px;
+ padding-right: 5px;
+}
#notification_div {
position: absolute;
left: 50%;
width: 28%;
- margin-left: -14%;
height: 45px;
- border: 1px solid #ffffff;
+ margin-left: -14%;
margin-top: 12px;
+ text-align: center;
+}
+
+#globalprogress {
+ height: 8px;
+ margin: 8px 5px;
}
#speedgraph {
@@ -181,6 +168,18 @@ header .logo { font-family: sans-serif
}
+#header_user {
+ background: url("../../img/default/icon_user_small_white.png")no-repeat;
+}
+
+#header_speed {
+ background: url("../../img/default/icon_speed_small_white.png")no-repeat;
+}
+
+#header_qeuue {
+ background: url("../../img/default/icon_clock_small_white.png")no-repeat;
+}
+
/*
Login
*/
@@ -197,7 +196,6 @@ header .logo { .login input, .login div{
padding: 3px;
}
-
.login_submit input {
padding: 5px 15px;
}
@@ -210,9 +208,6 @@ header .logo { .login_user span, .login_password span{
margin-right: 5px;
}
-.login_user input, .login_password input{
- width: 150px;
-}
/*
Footer
*/
diff --git a/module/web/templates/default/base.html b/module/web/templates/default/base.html index 64bb3294a..5ddfe129d 100644 --- a/module/web/templates/default/base.html +++ b/module/web/templates/default/base.html @@ -8,13 +8,17 @@ <link href="static/css/font.css" rel="stylesheet" type="text/css"/>
<link href="static/css/default/style.css" rel="stylesheet" type="text/css" media="screen"/>
<link href="static/css/black-tie/jquery-ui-1.8.22.custom.css" rel="stylesheet" type="text/css" media="screen"/>
+ <link href="static/css/nyroModal.css" rel="stylesheet" type="text/css" media="screen"/>
<script type="text/javascript" src="static/js/libs/jquery-1.8.0.min.js"></script>
<script type="text/javascript" src="static/js/libs/jquery.flot.min.js"></script>
<script type="text/javascript" src="static/js/libs/jquery-ui-1.8.22.custom.min.js"></script>
+ <script type="text/javascript" src="static/js/libs/jquery.nyroModal.custom.min.js"></script>
+
<script type="text/javascript" src="static/js/libs/underscore-min.js"></script>
<script type="text/javascript" src="static/js/libs/backbone-min.js"></script>
+
<title>{% block title %}pyLoad {{ _("Webinterface") }}{% endblock %}</title>
{% block head %}
@@ -29,24 +33,30 @@ {% if user %}
<div id="notification_div">
- <h1>Important Stuff will be here!</h1>
+ No runnings tasks
+ <div id="globalprogress"></div>
</div>
+ <script>
+ $(document).ready(function() {
+ $("#globalprogress").progressbar({ value: 37 });
+ });
+ </script>
<div class="header_block">
- <div class="header_icon" id="header_div_user">
- <span class="header_text" id="header_user">{{ user.name }}</span>
+ <div class="header_icon" id="header_user">
+ <span>{{ user.name }}</span>
</div>
- <div class="header_icon" id="header_div_logout">
+ <div class="header_text">
<a href="logout" id="header_logout">{{ _("Logout")}}</a>
</div>
</div>
<div id="speedgraph"></div>
<div class="header_block">
- <div class="header_icon" id="header_div_speed">
- <span class="header_text" id="header_speed">500 kb/s</span>
+ <div class="header_icon" id="header_speed">
+ <span class="header_text">500 kb/s</span>
</div>
- <div class="header_icon" id="header_div_downloads">
- <span class="header_text" id="header_downloads">5 / 125</span>
+ <div class="header_icon" id="header_qeuue">
+ <span class="header_text">5 / 125</span>
</div>
</div>
{% endif %}
@@ -54,12 +64,17 @@ </header>
<div id="push"></div>
<div id="content">
- {% for message in messages %}
- <div style="text-align: center">
- <b>{{ message }}</b><br/>
- </div>
- {% endfor %}
-
+ <a href="#test" class="nyroModal">DOM Element (hidden div)</a>
+ <div id="test" style="display: none; width: 600px;">
+ <a href="demoSent.php" class="nyroModal">Open a new modal</a><br />
+ Test
+ </div>
+ <script type="text/javascript">
+ var dialog;
+ $(function() {
+ dialog = $('.nyroModal').nyroModal();
+ });
+ </script>
{% block content %}
{% endblock content %}
</div>
@@ -161,7 +176,6 @@ update();
});
-
</script>
{% block deferred %}
{% endblock deferred %}
|