kallithea Changeset - 8b06c420491d

Changeset - 8b06c420491d

Parent rev.

Child rev.

[Not reviewed]

default

0 12 2

Marcin Kuzminski - 16 years ago 2010-04-25 01:25:54
marcin@python-works.com

statics moved to pylons.

14 files changed with 18 insertions and 15 deletions:

pylons_app/config/middleware.py

pylons_app/controllers/admin.py

pylons_app/controllers/changelog.py

pylons_app/controllers/error.py

pylons_app/controllers/files.py

pylons_app/controllers/hg.py

pylons_app/controllers/repos.py

pylons_app/controllers/shortlog.py

pylons_app/controllers/summary.py

pylons_app/controllers/users.py

pylons_app/public/images/hgicon.png

bin+new file

pylons_app/public/images/hglogo.png

bin+new file

pylons_app/templates/add.html

pylons_app/templates/base/base.html

0 comments (0 inline, 0 general)

pylons_app/config/middleware.py

➞

Show inline comments

@@ @@ -8,6 +8,7 @@ from pylons.middleware import ErrorHandl @@
 from pylons.wsgiapp import PylonsApp
 from routes.middleware import RoutesMiddleware
 from paste.auth.basic import AuthBasicHandler
 from pylons_app.lib.simplehg import SimpleHg
 from pylons_app.config.environment import load_environment
 from pylons_app.lib.auth import authfunc
@@ @@ -37,11 +38,13 @@ def make_app(global_conf, full_stack=Tru @@
     # The Pylons WSGI app
     app = PylonsApp(config=config)
     # CUSTOM MIDDLEWARE HERE (filtered by error handling middlewares)
     # Routing/Session/Cache Middleware
     app = RoutesMiddleware(app, config['routes.map'])
     app = SessionMiddleware(app, config)
     # CUSTOM MIDDLEWARE HERE (filtered by error handling middlewares)
     app = SimpleHg(app, config)
     app = AuthBasicHandler(app, config['repos_name'] + ' mercurial repository', authfunc)
     if asbool(full_stack):

pylons_app/controllers/admin.py

➞

Show inline comments

@@ @@ -20,7 +20,7 @@ log = logging.getLogger(__name__) @@
 class AdminController(BaseController):
     def __before__(self):
-        c.staticurl = g.statics
         c.admin_user = session.get('admin_user', False)
         c.admin_username = session.get('admin_username')

pylons_app/controllers/changelog.py

➞

Show inline comments

@@ @@ -13,7 +13,7 @@ log = logging.getLogger(__name__) @@
 class ChangelogController(BaseController):
     def __before__(self):
         c.repos_prefix = config['repos_name']
-        c.staticurl = g.statics
         c.repo_name = get_repo_slug(request)

pylons_app/controllers/error.py

➞

Show inline comments

@@ @@ -23,7 +23,7 @@ class ErrorController(BaseController): @@
+#
     def __before__(self):
         c.repos_prefix = config['repos_name']
-        c.staticurl = g.statics
         c.repo_name = request.environ['pylons.original_request']\
             .environ.get('PATH_INFO').split('/')[-1]

pylons_app/controllers/files.py

➞

Show inline comments

@@ @@ -11,7 +11,7 @@ log = logging.getLogger(__name__) @@
 class FilesController(BaseController):
     def __before__(self):
         c.repos_prefix = config['repos_name']
-        c.staticurl = g.statics
         c.repo_name = get_repo_slug(request)
     def index(self, repo_name, revision, f_path):

pylons_app/controllers/hg.py

➞

Show inline comments

@@ @@ -21,7 +21,7 @@ class HgController(BaseController): @@
     def __before__(self):
         c.repos_prefix = config['repos_name']
-        c.staticurl = g.statics
         c.repo_name = get_repo_slug(request)
     def index(self):

pylons_app/controllers/repos.py

➞

Show inline comments

@@ @@ -20,7 +20,7 @@ class ReposController(BaseController): @@
     @authenticate
     def __before__(self):
-        c.staticurl = g.statics
         c.admin_user = session.get('admin_user')
         c.admin_username = session.get('admin_username')
         self.sa = meta.Session

pylons_app/controllers/shortlog.py

➞

Show inline comments

@@ @@ -13,7 +13,7 @@ log = logging.getLogger(__name__) @@
 class ShortlogController(BaseController):
     def __before__(self):
         c.repos_prefix = config['repos_name']
-        c.staticurl = g.statics
         c.repo_name = get_repo_slug(request)

pylons_app/controllers/summary.py

➞

Show inline comments

@@ @@ -11,7 +11,7 @@ log = logging.getLogger(__name__) @@
 class SummaryController(BaseController):
     def __before__(self):
         c.repos_prefix = config['repos_name']
-        c.staticurl = g.statics
         c.repo_name = get_repo_slug(request)
     def index(self):

pylons_app/controllers/users.py

➞

Show inline comments

@@ @@ -20,7 +20,7 @@ class UsersController(BaseController): @@
     @authenticate
     def __before__(self):
-        c.staticurl = g.statics
         c.admin_user = session.get('admin_user')
         c.admin_username = session.get('admin_username')
         self.sa = meta.Session

pylons_app/public/images/hgicon.png

➞

Show inline comments

		new file 100644
		binary diff not shown

Show images

pylons_app/public/images/hglogo.png

➞

Show inline comments

		new file 100644
		binary diff not shown

Show images

pylons_app/templates/add.html

➞

Show inline comments

@@ @@ -2,9 +2,9 @@ @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head>
-    <link rel="icon" href="${c.staticurl}hgicon.png" type="image/png" />
+    <link rel="icon" href="/images/hgicon.png" type="image/png" />
     <meta name="robots" content="index, nofollow"/>
-    <link rel="stylesheet" href="${c.staticurl}style-monoblue.css" type="text/css" />
+    <link rel="stylesheet" href="/images/style-monoblue.css" type="text/css" />
        <title> Mercurial repositories add</title>
 </head>
@@ @@ -30,7 +30,7 @@ @@
     <div id="powered-by">
         <p>
         <a href="http://mercurial.selenic.com/" title="Mercurial">
-            <img src="${c.staticurl}hglogo.png" width=75 height=90 border=0 alt="mercurial"></a>
+            <img src="/images/hglogo.png" width="75" height="90" border=0 alt="mercurial"/></a>
         </p>
     </div>

pylons_app/templates/base/base.html

➞

Show inline comments

@@ @@ -2,7 +2,7 @@ @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head>
-    <link rel="icon" href="${c.staticurl}hgicon.png" type="image/png" />
+    <link rel="icon" href="/images/hgicon.png" type="image/png" />
     <meta name="robots" content="index, nofollow"/>
     <title>${next.title()}</title>
     ${self.css()}
@@ @@ -27,7 +27,7 @@ @@
     <div id="powered-by">
         <p>
         <a href="http://mercurial.selenic.com/" title="Mercurial">
-            <img src="${c.staticurl}hglogo.png" width="75" height="90" alt="mercurial"/></a>
+            <img src="/images/hglogo.png" width="75" height="90" alt="mercurial"/></a>
         </p>
     </div>

0 comments (0 inline, 0 general)