| [vhffs-dev] [1888] Anonymous panel pages have a new layout |
[ Thread Index |
Date Index
| More vhffs.org/vhffs-dev Archives
]
Revision: 1888
Author: beuss
Date: 2011-07-25 22:59:21 +0200 (Mon, 25 Jul 2011)
Log Message:
-----------
Anonymous panel pages have a new layout
Modified Paths:
--------------
trunk/vhffs-panel/templates/anonymous/login.tt
trunk/vhffs-panel/templates/anonymous/lost-password.tt
trunk/vhffs-panel/templates/layouts/anonymous.tt
trunk/vhffs-themes/light-grey/main.css
Modified: trunk/vhffs-panel/templates/anonymous/login.tt
===================================================================
--- trunk/vhffs-panel/templates/anonymous/login.tt 2011-07-25 20:59:10 UTC (rev 1887)
+++ trunk/vhffs-panel/templates/anonymous/login.tt 2011-07-25 20:59:21 UTC (rev 1888)
@@ -1,8 +1,3 @@
- [% INCLUDE 'misc/languages.tt' %]
-
- <div class="logo">
- </div>
-
<div class="misc" id="misc">
[% IF website.defined() %]
[% website = website | html %]
@@ -50,14 +45,4 @@
[% IF stats.defined() %]
<p>[% 'Woah, %s users and %s groups already trust %s' | i18n | pretty_print(stats.users, stats.groups, hostname) | html %]</p>
[% END %]
- [% IF public_url.defined() %]
- <p>
- <a href="[% public_url | i18n %]">[% 'Go to public area' | i18n %]</a>
- </p>
- [% END %]
</div>
-
-
- <div id="footer">
- <a href="http://www.vhffs.org";>[% 'Run VHFFS %s (%s)' | i18n | pretty_print(version_info.version, version_info.name) %]</a>
- </div>
Modified: trunk/vhffs-panel/templates/anonymous/lost-password.tt
===================================================================
--- trunk/vhffs-panel/templates/anonymous/lost-password.tt 2011-07-25 20:59:10 UTC (rev 1887)
+++ trunk/vhffs-panel/templates/anonymous/lost-password.tt 2011-07-25 20:59:21 UTC (rev 1888)
@@ -6,7 +6,7 @@
<h1>[% 'You lost your password? You\'re a bad guy!' | i18n | html %]</h1>
<form action="/lost_ack.pl" method="post" accept-charset="utf-8">
-<h2>[% 'But fortunately we\'re smart, so just type your login here<br/>and a new password will be sent to you by email!' | i18n | html %]</h2>
+<p>[% 'But fortunately we\'re smart, so just type your login here and a new password will be sent to you by email!' | i18n | html %]</p>
<p>
<label for="username">
[% 'Username:' | i18n | html %]
Modified: trunk/vhffs-panel/templates/layouts/anonymous.tt
===================================================================
--- trunk/vhffs-panel/templates/layouts/anonymous.tt 2011-07-25 20:59:10 UTC (rev 1887)
+++ trunk/vhffs-panel/templates/layouts/anonymous.tt 2011-07-25 20:59:21 UTC (rev 1888)
@@ -9,6 +9,35 @@
<script language="javascript" type="text/javascript" charset="utf-8" src="/js/tooltip.js"></script>
</head>
<body>
+<div id="background-container">
+ <div class="page-container-panel-anonymous">
+ <div id="loading" style="display:none">
+ <img src="/themes/[% theme %]/img/loading.gif" alt="Loading..."/>
+ </div>
+ <div class="navflag">
+ [% INCLUDE 'misc/languages.tt' %]
+ </div>
+ <div class="logo">
+ <a href="/"><img src="/themes/[% theme %]/img/vhffs-big.png" alt="Virtual hosting for free software"/></a>
+ </div>
+ <div id="top-menu">
+ <ul>
+[% IF(subscribe) %]
+ <li><a href="/subscribe.pl" class="ajax">[% 'Subscribe' | i18n %]</a></li>
+[% END %]
+ <li><a href="/lost.pl" class="ajax">[% 'Lost password' | i18n %]</a></li>
+[% IF public_url.defined() %]
+ <li><a href="[% public_url | html %]">[% 'Public area' | i18n %]</a></li>
+[% END %]
+ </ul>
+ </div>
+ <div class="content-panel-anonymous">
[% PROCESS $template %]
+ </div>
+ <div id="footer">
+ <p>[% 'Powered by %s' | i18n | pretty_print('<a href="http://www.vhffs.org";>VHFFS</a>') %]</p>
+ </div>
+ </div>
+</div>
</body>
</html>
Modified: trunk/vhffs-themes/light-grey/main.css
===================================================================
--- trunk/vhffs-themes/light-grey/main.css 2011-07-25 20:59:10 UTC (rev 1887)
+++ trunk/vhffs-themes/light-grey/main.css 2011-07-25 20:59:21 UTC (rev 1888)
@@ -19,7 +19,8 @@
background: url(img/background_body.png) top center repeat-y;
}
-.page-container-login {
+.page-container-panel-anonymous,
+.page-container-public {
width: 770px;
margin: 0px auto;
padding: 0px;
@@ -27,29 +28,17 @@
border: solid 1px rgb(100, 100, 100);
}
-.page-container-1 {
- width: 770px;
- margin: 0px auto;
- padding: 0px;
- border: solid 1px rgb(100, 100, 100);
-}
-
-.page-container-panel {
- width: 770px;
- margin: 0px auto;
- padding: 0px;
- border: solid 1px rgb(100, 100, 100);;
- background: url(img/background_layout_2.gif) top left repeat-y;
-}
-
.page-container-public {
- width: 770px;
- margin: 0px auto;
- padding: 0px;
- border: solid 1px rgb(100, 100, 100);;
background: url(img/background_layout_1.gif) top left repeat-y;
}
+.content-panel-anonymous,
+.content-panel{
+ width: 750px;
+ margin: 0px auto;
+ padding: 10px;
+}
+
/*************************************/
/* SECTION 2 - HEADER AND NAVIGATION */
/*************************************/