Login | Register
My pages Projects Community openCollabNet

Discussions > commits > svn commit: r276 - trunk: cwebapp/cwebapp cwebapp/cwebapp/static/css cwebapp/cwebapp/templates templates

Project highlights: Stable Version: 1.6.1, Development Version: 1.7.6

current
Discussion topic

Back to topic list

svn commit: r276 - trunk: cwebapp/cwebapp cwebapp/cwebapp/static/css cwebapp/cwebapp/templates templates

Reply

Author jjneely
Full name Jack Neely
Date 2006-09-04 18:48:24 PDT
Message Author: jjneely
Date: 2006-09-04 18:48:24-0700
New Revision: 276

Added:
   trunk/cwebapp/cwebap​p/static/css/current​.css
Removed:
   trunk/templates/
Modified:
   trunk/cwebapp/cwebapp/auth.py
   trunk/cwebapp/cwebap​p/templates/index.ki​d
   trunk/cwebapp/cwebap​p/templates/master.k​id

Log:
Merge in old CSS into TurboGears webapp. Remove templates/ directory.


Modified: trunk/cwebapp/cwebapp/auth.py
Url: http://current.tigri​s.org/source/browse/​current/trunk/cwebap​p/cwebapp/auth.py?vi​ew=diff&rev=276​&p1=trunk/cwebapp​/cwebapp/auth.py​&p2=trunk/cwebapp/cw​ebapp/auth.py&r1​=275&r2=276
====================​====================​====================​==================
--- trunk/cwebapp/cwebapp/auth.py (original)
+++ trunk/cwebapp/cwebapp/auth.py 2006-09-04 18:48:24-0700
@@ -49,9 +49,9 @@
         # Patch up arguments, take out login/password, and add a dict
         # describing the user
         kwargs['userInfo'] = userInfo
- del kwargs['userid']
- del kwargs['login']
- del kwargs['password']
+ for a in ['userid', 'login', 'password']:
+ if kwargs.has_key(a):
+ del kwargs[a]
         return fn(*args, **kwargs)
     return _wrapper
 

Added: trunk/cwebapp/cwebap​p/static/css/current​.css
Url: http://current.tigri​s.org/source/browse/​current/trunk/cwebap​p/cwebapp/static/css​/current.css?view=au​to&rev=276
====================​====================​====================​==================
--- (empty file)
+++ trunk/cwebapp/cwebap​p/static/css/current​.css 2006-09-04 18:48:24-0700
@@ -0,0 +1,93 @@
+body {
+ font-family: Arial, Lucida Grande, sans-serif;
+ padding: 0;
+ border: 0;
+ margin: 0;
+}
+
+#navibar {
+ clear: both;
+ display: block;
+ margin: 0;
+ padding: 0 10px;
+ font-size: 13px;
+}
+
+#navibar li {
+ float: left;
+ display: block;
+ margin: 0 2px;
+ padding: 2px 5px;
+ border: 1px solid #9C9C9C;
+ border-bottom: none;
+ white-space: nowrap;
+ background: white;
+}
+
+#navibar li.navlink {
+ float: left;
+ display: block;
+ margin: 0 2px;
+ padding: 2px 5px;
+ border: 1px solid #9C9C9C;
+ border-bottom: none;
+ white-space: nowrap;
+}
+
+#navibar li.help {
+ float: right;
+ display: block;
+ margin: 0 2px;
+ padding: 2px 5px;
+ border: 1px solid #9C9C9C;
+ border-bottom: none;
+ white-space: nowrap;
+}
+
+#navibar a.foo, #navibar a, #navibar a:visited {
+ color: black;
+ text-decoration: none;
+}
+
+#navibar li:hover {
+ background: #cccccc;
+}
+
+#pageline {
+ clear: both;
+ margin: 0;
+ padding: 0;
+ width: 100%;
+ height: 4px;
+ line-height: 4px;
+ border-bottom: 1px solid #9C9C9C;
+ background: #0000ff;
+}
+
+#header {
+ background: #ececec;
+ margin: 0;
+ padding: 0;
+}
+
+#title {
+ float: left;
+ font-size: 3em;
+ font-weight: bold;
+ margin: 0;
+ padding: 0 10px;
+}
+
+#headertext {
+ float: right;
+ margin:0;
+ padding-right: 10px;
+ color: black;
+ font-size: 1em;
+}
+
+#content {
+ margin: 1em;
+ color: black;
+}
+

Modified: trunk/cwebapp/cwebap​p/templates/index.ki​d
Url: http://current.tigri​s.org/source/browse/​current/trunk/cwebap​p/cwebapp/templates/​index.kid?view=diff​&rev=276&p1=t​runk/cwebapp/cwebapp​/templates/index.kid​&p2=trunk/cwebap​p/cwebapp/templates/​index.kid&r1=275​&r2=276
====================​====================​====================​==================
--- trunk/cwebapp/cwebap​p/templates/index.ki​d (original)
+++ trunk/cwebapp/cwebap​p/templates/index.ki​d 2006-09-04 18:48:24-0700
@@ -4,6 +4,8 @@
 
 <head>
     <meta content="text/html; charset=UTF-8" http-equiv="content-type" py:replace="''"/>
+ <link rel="stylesheet" type="text/css" charset="utf-8"
+ href="${std.url('/s​tatic/css/current.cs​s')}" />
     <title>Current​</title>
 </head>
 

Modified: trunk/cwebapp/cwebap​p/templates/master.k​id
Url: http://current.tigri​s.org/source/browse/​current/trunk/cwebap​p/cwebapp/templates/​master.kid?view=diff​&rev=276&p1=​trunk/cwebapp/cwebap​p/templates/master.k​id&p2=trunk/cweb​app/cwebapp/template​s/master.kid&r1=​275&r2=276
====================​====================​====================​==================
--- trunk/cwebapp/cwebap​p/templates/master.k​id (original)
+++ trunk/cwebapp/cwebap​p/templates/master.k​id 2006-09-04 18:48:24-0700
@@ -1,20 +1,46 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR​/xhtml1/DTD/xhtml1-t​ransitional.dtd">
 <?python import sitetemplate ?>
-<html xmlns="http://www.w3.org/1999/xhtml" xmlns:py="http://purl.org/kid/ns#" py:extends="sitetemplate">
+<html xmlns="http://www.w3.org/1999/xhtml"
+ xmlns:py="http://purl.org/kid/ns#"
+ py:extends="sitetemplate">
 
 <head>
- <meta content="text/html; charset=UTF-8" http-equiv="content-type" py:replace="''"/>
+ <meta content="text/html; charset=UTF-8" http-equiv="content-type"
+ py:replace="''"/>
+ <link rel="stylesheet" type="text/css" charset="utf-8"
+ href="${std.url('/s​tatic/css/current.cs​s')}" />
     <title>Your title goes here</title>
 </head>
 
 <body py:match="item.tag=='{http://www.w3.org/19​99/xhtml}body'">
- <p align="center">
+ <!--<p align="center">
     <img src="${std.url('/st​atic/images/current-​2.jpg')}"
       alt="Current" height="100" width="300" />
- </p>
+ </p>-->
 
- <div py:if="tg_flash" class="flash" py:content="tg_flash​"></div>
-
- <div py:replace="item[:]"/>
-</body>
+ <div id="header">
+ <p id="title">Current</p>
+ <p id="headertext">Current Version 1.7.4</p>
+
+ <ul id="navibar">
+ <li class="navlink">
+ <a href="${std.url('/i​ndex')}">Main<​/a>
+ </li>
+ <li class="navlink">
+ <a href="${std.url('/s​ystems')}">System​s</a>
+ </li>
+ <li class="navlink">
+ <a href="${std.url('/c​hannels')}">Chann​els</a>
+ </li>
+
+ <li class="help">
+ <a href="http://current.tigris.org">Current Home</a>
+ </li>
+ </ul>
+ <div id="pageline"><hr style="display:none;" /></div>
+ </div>
+
+ <div id="content" py:content="item[:]"/>
+
+ </body>
 </html>

« Previous message in topic | 1 of 1 | Next message in topic »

Messages

Show all messages in topic

svn commit: r276 - trunk: cwebapp/cwebapp cwebapp/cwebapp/static/css cwebapp/cwebapp/templates templates jjneely Jack Neely 2006-09-04 18:48:24 PDT
Messages per page: