Browse Source

cosmetic on user interface

Damien Accorsi 10 years ago
parent
commit
1fd012e668

+ 1 - 1
pboard/pboard/templates/create_account.mak View File

@@ -18,5 +18,5 @@
18 18
 </div>
19 19
 
20 20
 <div class="row">
21
-${POD.SignUpForm('16em')}
21
+  ${POD.SignUpForm('16em')}
22 22
 </div>

+ 33 - 56
pboard/pboard/templates/index.mak View File

@@ -2,30 +2,52 @@
2 2
 <%namespace name="POD" file="pboard.templates.pod"/>
3 3
 
4 4
 <%def name="title()">
5
-  pod :: take notes, list tasks, write documents, manage projects
5
+  pod :: take notes, list tasks, write documents, manage projects blabla
6 6
 </%def>
7 7
 
8 8
   <div class="row">
9
-    <div class="span10 offset1">
10
-      <div class="row">
11
-        <div class="span10">
9
+        <div class="span12">
12 10
           <div class="well">
13 11
             <h1>pod <small>Simple tool, flexible data.</small></h1>
14 12
           </div>
15 13
         </div>
16
-      </div>
17
-    </div>
18 14
   </div>
19 15
 
20 16
   <div class="row">
21 17
     <div class="span10 offset1">
22 18
       <div class="row hidden-phone hidden-tablet">
19
+
20
+        ## LOGIN SCREEN
21
+        <div class="span3 offset2">
22
+          % if not request.identity:
23
+            <div class="well text-center" style="min-height: 16em;">
24
+              <form action="${tg.url('/login_handler')}">
25
+                <fieldset>
26
+                <legend><i class="fa fa-key" style="vertical-align: baseline !important;"></i> Login</legend>
27
+                <input class="span2" type="text" id="login" name="login" placeholder="email..."><br/>
28
+                <input class="span2" type="password" id="password" name="password" placeholder="password..."><br/>
29
+                <div class="span2 control-group">
30
+                  <input type="checkbox" id="loginremember" name="remember" value="2252000"/> ${_('Remember me')}
31
+                </div>
32
+                <input type="submit" id="submit" value="Login" />
33
+                </fieldset>
34
+              </form>
35
+            </div>
36
+          % else:
37
+            <div class="well text-center" style="min-height: 16em;">
38
+              <p>${_('Welcome, ')}${request.identity['user'].display_name}</p>
39
+              <p>${_('Click on <a href="{0}">Document</a> in the top menu to access you data.'.format(tg.url('/document')))|n}</p>
40
+            </div>
41
+          % endif
42
+        </div>
43
+        ## END OF LOGIN SCREEN
44
+
23 45
         <div class="span3" >
24
-          <div class="well text-right" style="min-height: 15em;">
25
-            <p>Take <strong>notes</strong> <i class="pod-blue fa-2x fa-fw fa fa-pencil" style="vertical-align: middle;"></i></p>
26
-            <p>List <strong>tasks</strong> <i class="pod-blue fa-2x fa-fw fa fa-list" style="vertical-align: middle;"></i></p>
27
-            <p>Write <strong>documents</strong> <i class="pod-blue fa-2x fa-fw fa fa-file-text-o" style="vertical-align: middle;"></i></p>
28
-            <p>Change <strong>Status</strong> <i class="pod-blue fa-2x fa-fw fa fa-check-square-o" style="vertical-align: middle;"></i> </p>
46
+          <div class="well" style="min-height: 15em;">
47
+            <p><i class="pod-blue fa-2x fa-fw fa fa-pencil" style="vertical-align: middle;"></i> Take <strong>notes</strong> </p>
48
+            <p><i class="pod-blue fa-2x fa-fw fa fa-list" style="vertical-align: middle;"></i> List <strong>tasks</strong> </p>
49
+            <p><i class="pod-blue fa-2x fa-fw fa fa-file-text-o" style="vertical-align: middle;"></i> Write <strong>documents</strong></p>
50
+            <p><i class="pod-blue fa-2x fa-fw fa fa-check-square-o" style="vertical-align: middle;"></i>Change <strong>Status</strong></p>
29 51
             <hr/>
30 52
             <p class="text-center">
31 53
               <i class="pod-blue fa-2x fa-fw fa fa-file-text-o" title="${_('Text documents')}" style="vertical-align: middle;"></i>
@@ -37,51 +59,6 @@
37 59
           </div>
38 60
         </div>
39 61
 
40
-        <div class="span4">
41
-          <div class="well text-center" style="min-height: 16em;">
42
-            <div class="row-fluid">
43
-            % for (icon, label) in (('fa-search', 'Search'), ('fa-dashboard', 'Track')):
44
-              <div class="span6">
45
-                <i class="pod-blue fa-4x fa ${icon}"></i><br/>
46
-                <strong>${label}</strong>
47
-              </div>
48
-            % endfor
49
-            </div>
50
-            <div class="row-fluid" style="margin-top: 2em;">
51
-            % for (icon, label) in (('fa-sort-alpha-asc', 'Organize'), ('fa-users', 'Manage')):
52
-              <div class="span6">
53
-                <i class="pod-blue fa-4x fa-fw fa ${icon}"></i><br/>
54
-                <strong>${label}</strong>
55
-              </div>
56
-            % endfor
57
-            </div>
58
-          </div>
59
-        </div>
60
-
61
-		% if not request.identity:
62
-        <div class="span3">
63
-          <div class="well text-center" style="min-height: 16em;">
64
-			<form action="${tg.url('/login_handler')}">
65
-			  <fieldset>
66
-				<legend><i class="fa fa-key" style="vertical-align: baseline !important;"></i> Login</legend>
67
-				<input class="span2" type="text" id="login" name="login" placeholder="email...">
68
-				<input class="span2" type="password" id="password" name="password" placeholder="password...">
69
-				<div class="span2 control-group">
70
-				  Remember me <input type="checkbox" id="loginremember" name="remember" value="2252000"/>
71
-				</div>
72
-				<input type="submit" id="submit" value="Login" />
73
-			  </fieldset>
74
-			</form>
75
-		  </div>
76
-		</div>
77
-		% else:
78
-		<div class="span3">
79
-          <div class="well text-center" style="min-height: 16em;">
80
-		    <p>${_('Welcome, ')}${request.identity['user'].display_name}</p>
81
-			<p>${_('Click on Documents in the top menu to access you data.')}</p>
82
-		  </div>
83
-		</div>
84
-		% endif
85 62
       </div>
86 63
     </div>
87 64
   </div>

+ 2 - 2
pboard/pboard/templates/pod.mak View File

@@ -77,10 +77,10 @@
77 77
 </%def>
78 78
 
79 79
 <%def name='SignUpForm(psCssMinHeight="1em")'>
80
-  <div class="span3">
80
+  <div class="span3 offset4">
81 81
     <form class="well" method="POST" style="min-height: ${psCssMinHeight};" action="${tg.url('/public_api/create_account')}">
82 82
       <fieldset>
83
-        <legend>Want to try?</legend>
83
+        <legend>${_('Create an account')}</legend>
84 84
         <input type="text"     name="email"            id="email" placeholder="Email"><br/>
85 85
         <input type="password" name="password"         id="password" placeholder="Password"><br/>
86 86
         <input type="password" name="retyped_password" id="retyped_password" placeholder="Retype your password"><br/>