Browse Source

bug #12: fixes page titles + improve home page

damien 11 years ago
parent
commit
7f8f864c64

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

@@ -2,7 +2,7 @@
2 2
 <%namespace name="POD" file="pboard.templates.pod"/>
3 3
 
4 4
 <%def name="title()">
5
-pod > dashobard
5
+pod :: your dashboard
6 6
 </%def>
7 7
 
8 8
   <div class="row">

+ 1 - 1
pboard/pboard/templates/debug/environ.mak View File

@@ -1,7 +1,7 @@
1 1
 <%inherit file="local:templates.master"/>
2 2
 
3 3
 <%def name="title()">
4
-  debug: environment object
4
+pod :: debug :: request.environment
5 5
 </%def>
6 6
 
7 7
 <h2>The WSGI nature of the framework</h2>

+ 1 - 1
pboard/pboard/templates/debug/iconset.mak View File

@@ -1,7 +1,7 @@
1 1
 <%inherit file="local:templates.master"/>
2 2
 
3 3
 <%def name="title()">
4
-  debug: icon set
4
+pod :: debug - iconset
5 5
 </%def>
6 6
 
7 7
     <style>

+ 1 - 1
pboard/pboard/templates/debug/identity.mak View File

@@ -1,7 +1,7 @@
1 1
 <%inherit file="local:templates.master"/>
2 2
 
3 3
 <%def name="title()">
4
-  Learning TurboGears 2.3: Information about TG and WSGI
4
+pod :: debug :: request.identity
5 5
 </%def>
6 6
 
7 7
 <h2>Identity object</h2>

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

@@ -2,7 +2,7 @@
2 2
 <%namespace name="POD" file="pboard.templates.pod"/>
3 3
 
4 4
 <%def name="title()">
5
-POD :: ${current_node.getTruncatedLabel(40)} [${current_node.getStatus().label}]
5
+pod :: document ${current_node.getTruncatedLabel(40)} [#${current_node.node_id} / ${current_node.getStatus().label}]
6 6
 </%def>
7 7
 
8 8
 <%def name="node_treeview_for_set_parent_menu(node_id, node_list, indentation=-1)">

+ 39 - 21
pboard/pboard/templates/index.mak View File

@@ -1,33 +1,51 @@
1 1
 <%inherit file="local:templates.master"/>
2 2
 
3 3
 <%def name="title()">
4
-  Welcome to TurboGears 2.3, standing on the shoulders of giants, since 2007
4
+  pod :: take notes, list tasks, write documents, manage projects
5 5
 </%def>
6 6
 
7 7
   <div class="row">
8
-    <div class="span9 hidden-phone hidden-tablet">
9
-      <div class="hero-unit">
10
-        <h1>pod <small>your information compagnion</small></h1>
8
+    <div class="span9">
9
+      <div class="row">
10
+        <div class="well">
11
+          <h1>pod <small>your information compagnion</small></h1>
12
+        </div>
11 13
       </div>
12 14
 
13
-      <div class="row">
14
-        <div class="span2 alert alert-success">
15
-          <p><button><i class="icon-g-cardio"></i> <strong>Track</strong> projects</button></p>
16
-          <p><button><i class="icon-g-edit"></i> <strong>Take</strong> notes</button></p>
17
-          <p><button><i class="icon-g-attach"></i> <strong>Keep</strong> files</button></p>
18
-          <span><button><i class="icon-g-ok"></i> <strong>Manage</strong> status</button></span>
15
+      <div class="row hidden-phone hidden-tablet">
16
+        <div class="span3 text-right">
17
+          <p>Take <strong>notes</strong> <i class="pod-blue fa-2x fa-fw fa fa-pencil" style="vertical-align: middle;"></i></p>
18
+          <p>List <strong>tasks</strong> <i class="pod-blue fa-2x fa-fw fa fa-list" style="vertical-align: middle;"></i></p>
19
+          <p>Write <strong>documents</strong> <i class="pod-blue fa-2x fa-fw fa fa-file-text-o" style="vertical-align: middle;"></i></p>
20
+          <p>Change <strong>Status</strong> <i class="pod-blue fa-2x fa-fw fa fa-check-square-o" style="vertical-align: middle;"></i> </p>
21
+        </div>
22
+        <div class="span1 text-center" title="${_('What for?')}">
23
+          <i class="fa fa-angle-double-right fa-5x"></i><br/>
19 24
         </div>
20
-        <div class="span6 well well-small">
21
-          <h5>
22
-            <i class="fa fa-users fa-2x"></i>
23
-            Use cases
24
-          </h5>
25
-          <ul>
26
-            <li>Search a job</li>
27
-            <li>Manage clients</li>
28
-            <li>Track tasks</li>
29
-            <li>...</li>
30
-          </ul>
25
+
26
+        <div class="span5">
27
+          <div class="well text-center">
28
+            <div class="row">
29
+            % for id, (icon, label) in enumerate((('fa-search', 'Search'), ('fa-dashboard', 'Track'), ('fa-sort-alpha-asc', 'Organize'), ('fa-users', 'Manage'))):
30
+              <div class="span1">
31
+                % for i in range(id):
32
+                  <br/>
33
+                % endfor
34
+                <i class="pod-blue fa-3x fa-fw fa ${icon}"></i>
35
+                <br/>
36
+                <strong>${label}</strong>
37
+              </div>
38
+            % endfor
39
+            </div>
40
+          </div>
41
+        </div>
42
+      </div>
43
+
44
+      <div class="row hidden-phone hidden-tablet">
45
+        <div class="span5 offset4 text-center" style="vertical-align: top;">
46
+          <strong>
47
+            jobs, projects, prospects, clients, knowledge, ...
48
+          </strong>
31 49
         </div>
32 50
       </div>
33 51
     </div>

+ 5 - 2
pboard/pboard/templates/login.mak View File

@@ -1,5 +1,8 @@
1 1
 <%inherit file="local:templates.master"/>
2
-<%def name="title()">Login Form</%def>
2
+<%def name="title()">
3
+  pod :: login
4
+</%def>
5
+
3 6
 <div id="loginform">
4 7
 <form action="${tg.url('/login_handler', params=dict(came_from=came_from, __logins=login_counter))}" method="POST" class="loginfields">
5 8
     <h2><span>Login</span></h2>
@@ -8,4 +11,4 @@
8 11
     <label id="labelremember" for="loginremember">remember me</label><input type="checkbox" id="loginremember" name="remember" value="2252000"/>
9 12
     <input type="submit" id="submit" value="Login" />
10 13
 </form>
11
-</div>
14
+</div>

+ 6 - 3
pboard/pboard/templates/master.mak View File

@@ -1,3 +1,4 @@
1
+<%namespace name="POD" file="pboard.templates.pod"/>
1 2
 <!DOCTYPE html>
2 3
 <html>
3 4
 <head>
@@ -80,6 +81,7 @@ h3:Hover div.pod-toolbar {
80 81
 
81 82
 .pod-blue {color: #3a87ad !important; }
82 83
 .pod-red {color: #F00 !important; }
84
+.pod-grey {color: #999 !important; }
83 85
 
84 86
 body { padding-top: 60px; }
85 87
 @media screen and (max-width: 768px) {
@@ -493,8 +495,8 @@ tr:Hover td div.pod-toolbar {
493 495
                   left_panel.css('display', 'none');
494 496
                   metadata_panel.css('display', 'block');
495 497
                   
496
-                  main_panel.removeClass('span12');
497
-                  main_panel.addClass('span9');
498
+                  main_panel.removeClass('span9');
499
+                  main_panel.addClass('span12');
498 500
                   
499 501
                   docu_panel.removeClass('span5');
500 502
                   docu_panel.removeClass('span12');
@@ -626,7 +628,8 @@ tr:Hover td div.pod-toolbar {
626 628
       <div class="container">
627 629
         <div class="nav-collapse">
628 630
           <ul class="nav">
629
-            <li>
631
+            <li class="">
632
+##            ${POD.isCurrentPage('home', page)}
630 633
               <a href="${tg.url('/')}">
631 634
                 <i class="fa fa-home"></i>
632 635
                 <strong>pod</strong>