Browse Source

Account creation page moved to /create_account and login form moved to

sferot 10 years ago
parent
commit
be1a2ecb68

+ 3 - 0
pboard/pboard/controllers/root.py View File

@@ -165,5 +165,8 @@ class RootController(BaseController):
165 165
 
166 166
         return dict(search_string=keywords, found_nodes=loFoundNodes)
167 167
 
168
+    @expose('pboard.templates.create_account')
169
+    def create_account(self):
170
+        return dict()
168 171
 
169 172
 

+ 22 - 0
pboard/pboard/templates/create_account.mak View File

@@ -0,0 +1,22 @@
1
+<%inherit file="local:templates.master"/>
2
+<%namespace name="POD" file="pboard.templates.pod"/>
3
+
4
+<%def name="title()">
5
+  pod :: ${_('Create account')}
6
+</%def>
7
+
8
+<div class="row">
9
+  <div class="span10 offset1">
10
+    <div class="row">
11
+      <div class="span10">
12
+        <div class="well">
13
+          <h1>pod <small>Simple tool, flexible data.</small></h1>
14
+        </div>
15
+      </div>
16
+    </div>
17
+  </div>
18
+</div>
19
+
20
+<div class="row">
21
+${POD.SignUpForm('16em')}
22
+</div>

+ 24 - 16
pboard/pboard/templates/index.mak View File

@@ -58,22 +58,30 @@
58 58
           </div>
59 59
         </div>
60 60
 
61
-        ${POD.SignUpForm('16em')}
62
-        <!--div class="span2">
63
-          <div class="row">
64
-            <p style="border: 1px solid #F00;">
65
-              Want to try?
66
-            </p>
67
-          </div>
68
-          <div class="row">
69
-            <p class="btn btn-success">
70
-              <a class="btn btn-success">
71
-                <i class="fa fa-2x fa-dot-circle-o"></i>
72
-                <strong>Sign up</strong>
73
-              </a>
74
-            </p>
75
-          </div>
76
-        </div-->
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
77 85
       </div>
78 86
     </div>
79 87
   </div>

+ 1 - 19
pboard/pboard/templates/master.mak View File

@@ -186,25 +186,7 @@
186 186
             </li>
187 187
 
188 188
 
189
-            % if not request.identity:
190
-              <li class="dropdown">
191
-                <a href="#" class="dropdown-toggle" data-toggle="dropdown"><i class="fa fa-user"></i> Login</a>
192
-                <ul class="dropdown-menu pull-right">
193
-                  <li class="text-center">
194
-                    <form action="${tg.url('/login_handler')}">
195
-                      <fieldset>
196
-                        <legend><i class="fa fa-key" style="vertical-align: baseline !important;"></i> Login</legend>
197
-                        <input class="span2" type="text" id="login" name="login" placeholder="email...">
198
-                        <input class="span2" type="password" id="password" name="password" placeholder="password...">
199
-                        <div class="span2 control-group">
200
-                          Remember me <input type="checkbox" id="loginremember" name="remember" value="2252000"/>
201
-                        </div>
202
-                        <input type="submit" id="submit" value="Login" />
203
-                      </fieldset>
204
-                    </form>
205
-                 </ul>
206
-              </li>
207
-            % else:
189
+            % if request.identity:
208 190
               <li class="dropdown">
209 191
                 <a href="#" class="dropdown-toggle" data-toggle="dropdown"><i class="fa fa-user"></i> ${request.identity['user'].display_name}</a>
210 192
                 <ul class="dropdown-menu pull-right">