From fb30035ec15d56ac93362160e08f0ffbbfdd1212 Mon Sep 17 00:00:00 2001 From: Chris McDonough Date: Thu, 4 Nov 2010 21:13:54 -0400 Subject: - Move static dir from pkg/templates/ to /pkg/ in pyramid_* paster templates. --- docs/narr/MyProject/myproject/__init__.py | 2 +- docs/narr/MyProject/myproject/static/favicon.ico | Bin 0 -> 1406 bytes docs/narr/MyProject/myproject/static/logo.png | Bin 0 -> 6641 bytes docs/narr/MyProject/myproject/static/pylons.css | 70 +++++++++++++++++++++ .../myproject/templates/static/favicon.ico | Bin 1406 -> 0 bytes .../MyProject/myproject/templates/static/logo.png | Bin 6641 -> 0 bytes .../myproject/templates/static/pylons.css | 70 --------------------- docs/narr/project.rst | 51 ++++++++------- 8 files changed, 96 insertions(+), 97 deletions(-) create mode 100644 docs/narr/MyProject/myproject/static/favicon.ico create mode 100644 docs/narr/MyProject/myproject/static/logo.png create mode 100644 docs/narr/MyProject/myproject/static/pylons.css delete mode 100644 docs/narr/MyProject/myproject/templates/static/favicon.ico delete mode 100644 docs/narr/MyProject/myproject/templates/static/logo.png delete mode 100644 docs/narr/MyProject/myproject/templates/static/pylons.css (limited to 'docs/narr') diff --git a/docs/narr/MyProject/myproject/__init__.py b/docs/narr/MyProject/myproject/__init__.py index 2dbaf0a88..ac6ece3c1 100644 --- a/docs/narr/MyProject/myproject/__init__.py +++ b/docs/narr/MyProject/myproject/__init__.py @@ -12,7 +12,7 @@ def app(global_config, **settings): config.add_view('myproject.views.my_view', context='myproject.models.MyModel', renderer='myproject:templates/mytemplate.pt') - config.add_static_view('static', 'myproject:templates/static') + config.add_static_view('static', 'myproject:static') config.end() return config.make_wsgi_app() diff --git a/docs/narr/MyProject/myproject/static/favicon.ico b/docs/narr/MyProject/myproject/static/favicon.ico new file mode 100644 index 000000000..71f837c9e Binary files /dev/null and b/docs/narr/MyProject/myproject/static/favicon.ico differ diff --git a/docs/narr/MyProject/myproject/static/logo.png b/docs/narr/MyProject/myproject/static/logo.png new file mode 100644 index 000000000..88f5d9865 Binary files /dev/null and b/docs/narr/MyProject/myproject/static/logo.png differ diff --git a/docs/narr/MyProject/myproject/static/pylons.css b/docs/narr/MyProject/myproject/static/pylons.css new file mode 100644 index 000000000..a9c5c55c2 --- /dev/null +++ b/docs/narr/MyProject/myproject/static/pylons.css @@ -0,0 +1,70 @@ +html,body,div,span,applet,object,iframe,h1,h2,h3,h4,h5,h6,p,blockquote,pre,a,abbr,acronym,address,big,cite,code,del,dfn,em,font,img,ins,kbd,q,s,samp,small,strike,strong,sub,sup,tt,var,b,u,i,center,dl,dt,dd,ol,ul,li,fieldset,form,label,legend,table,caption,tbody,tfoot,thead,tr,th,td{margin:0;padding:0;border:0;outline:0;font-size:100%;/* 16px */ +vertical-align:baseline;background:transparent;} +body{line-height:1;} +ol,ul{list-style:none;} +blockquote,q{quotes:none;} +blockquote:before,blockquote:after,q:before,q:after{content:'';content:none;} +/* remember to define focus styles! */ +:focus{outline:0;} +/* remember to highlight inserts somehow! */ +ins{text-decoration:none;} +del{text-decoration:line-through;} +/* tables still need 'cellspacing="0"' in the markup */ +table{border-collapse:collapse;border-spacing:0;} +/* restyling */ +sub{vertical-align:sub;font-size:smaller;line-height:normal;} +sup{vertical-align:super;font-size:smaller;line-height:normal;} +/* lists */ +ul,menu,dir{display:block;list-style-type:disc;margin:1em 0;padding-left:40px;} +ol{display:block;list-style-type:decimal-leading-zero;margin:1em 0;padding-left:40px;} +li{display:list-item;} +/* nested lists have no top/bottom margins */ +ul ul,ul ol,ul dir,ul menu,ul dl,ol ul,ol ol,ol dir,ol menu,ol dl,dir ul,dir ol,dir dir,dir menu,dir dl,menu ul,menu ol,menu dir,menu menu,menu dl,dl ul,dl ol,dl dir,dl menu,dl dl{margin-top:0;margin-bottom:0;} +/* 2 deep unordered lists use a circle */ +ol ul,ul ul,menu ul,dir ul,ol menu,ul menu,menu menu,dir menu,ol dir,ul dir,menu dir,dir dir{list-style-type:circle;} +/* 3 deep (or more) unordered lists use a square */ +ol ol ul,ol ul ul,ol menu ul,ol dir ul,ol ol menu,ol ul menu,ol menu menu,ol dir menu,ol ol dir,ol ul dir,ol menu dir,ol dir dir,ul ol ul,ul ul ul,ul menu ul,ul dir ul,ul ol menu,ul ul menu,ul menu menu,ul dir menu,ul ol dir,ul ul dir,ul menu dir,ul dir dir,menu ol ul,menu ul ul,menu menu ul,menu dir ul,menu ol menu,menu ul menu,menu menu menu,menu dir menu,menu ol dir,menu ul dir,menu menu dir,menu dir dir,dir ol ul,dir ul ul,dir menu ul,dir dir ul,dir ol menu,dir ul menu,dir menu menu,dir dir menu,dir ol dir,dir ul dir,dir menu dir,dir dir dir{list-style-type:square;} +.hidden{display:none;} +p{line-height:1.5em;} +h1{font-size:1.75em;/* 28px */ +line-height:1.7em;font-family:helvetica,verdana;} +h2{font-size:1.5em;/* 24px */ +line-height:1.7em;font-family:helvetica,verdana;} +h3{font-size:1.25em;/* 20px */ +line-height:1.7em;font-family:helvetica,verdana;} +h4{font-size:1em;line-height:1.7em;font-family:helvetica,verdana;} +html,body{width:100%;height:100%;} +body{margin:0;padding:0;background-color:#ffffff;position:relative;font:16px/24px "Nobile","Lucida Grande",Lucida,Verdana,sans-serif;} +a{color:#1b61d6;text-decoration:none;} +a:hover{color:#e88f00;text-decoration:underline;} +body h1, +body h2, +body h3, +body h4, +body h5, +body h6{font-family:"Nobile","Lucida Grande",Lucida,Verdana,sans-serif;font-weight:normal;color:#144fb2;font-style:normal;} +#header,#footer{width:100%;color:#ffffff;height:40px;position:absolute;text-align:center;line-height:40px;overflow:hidden;font-size:12px;} +#header{background-color:#e88f00;top:0;font-size:14px;} +#footer{background-color:#000000;bottom:0;} +.header,.footer{width:700px;margin-right:auto;margin-left:auto;} +.wrapper{width:100%} +#top,#bottom{width:100%;} +#top{color:#888;background-color:#eee;height:300px;border-bottom:2px solid #ddd;} +#bottom{color:#222;background-color:#ffffff;} +.top,.bottom{width:700px;margin-right:auto;margin-left:auto;} +.top{padding-top:100px;} +.app-welcome{margin-top:25px;} +.app-name{color:#000000;font-weight:bold;} +.bottom{padding-top:50px;} +#left{width:325px;float:left;padding-right:25px;} +#right{width:325px;float:right;padding-left:25px;} +.align-left{text-align:left;} +.align-right{text-align:right;} +.align-center{text-align:center;} +ul.links{margin:0;padding:0;} +ul.links li{list-style-type:none;font-size:14px;} +form{border-style:none;} +fieldset{border-style:none;} +input{color:#222;border:1px solid #ccc;font-family:sans-serif;font-size:12px;line-height:16px;} +input[type=text]{} +input[type=submit]{background-color:#ddd;font-weight:bold;} diff --git a/docs/narr/MyProject/myproject/templates/static/favicon.ico b/docs/narr/MyProject/myproject/templates/static/favicon.ico deleted file mode 100644 index 71f837c9e..000000000 Binary files a/docs/narr/MyProject/myproject/templates/static/favicon.ico and /dev/null differ diff --git a/docs/narr/MyProject/myproject/templates/static/logo.png b/docs/narr/MyProject/myproject/templates/static/logo.png deleted file mode 100644 index 88f5d9865..000000000 Binary files a/docs/narr/MyProject/myproject/templates/static/logo.png and /dev/null differ diff --git a/docs/narr/MyProject/myproject/templates/static/pylons.css b/docs/narr/MyProject/myproject/templates/static/pylons.css deleted file mode 100644 index a9c5c55c2..000000000 --- a/docs/narr/MyProject/myproject/templates/static/pylons.css +++ /dev/null @@ -1,70 +0,0 @@ -html,body,div,span,applet,object,iframe,h1,h2,h3,h4,h5,h6,p,blockquote,pre,a,abbr,acronym,address,big,cite,code,del,dfn,em,font,img,ins,kbd,q,s,samp,small,strike,strong,sub,sup,tt,var,b,u,i,center,dl,dt,dd,ol,ul,li,fieldset,form,label,legend,table,caption,tbody,tfoot,thead,tr,th,td{margin:0;padding:0;border:0;outline:0;font-size:100%;/* 16px */ -vertical-align:baseline;background:transparent;} -body{line-height:1;} -ol,ul{list-style:none;} -blockquote,q{quotes:none;} -blockquote:before,blockquote:after,q:before,q:after{content:'';content:none;} -/* remember to define focus styles! */ -:focus{outline:0;} -/* remember to highlight inserts somehow! */ -ins{text-decoration:none;} -del{text-decoration:line-through;} -/* tables still need 'cellspacing="0"' in the markup */ -table{border-collapse:collapse;border-spacing:0;} -/* restyling */ -sub{vertical-align:sub;font-size:smaller;line-height:normal;} -sup{vertical-align:super;font-size:smaller;line-height:normal;} -/* lists */ -ul,menu,dir{display:block;list-style-type:disc;margin:1em 0;padding-left:40px;} -ol{display:block;list-style-type:decimal-leading-zero;margin:1em 0;padding-left:40px;} -li{display:list-item;} -/* nested lists have no top/bottom margins */ -ul ul,ul ol,ul dir,ul menu,ul dl,ol ul,ol ol,ol dir,ol menu,ol dl,dir ul,dir ol,dir dir,dir menu,dir dl,menu ul,menu ol,menu dir,menu menu,menu dl,dl ul,dl ol,dl dir,dl menu,dl dl{margin-top:0;margin-bottom:0;} -/* 2 deep unordered lists use a circle */ -ol ul,ul ul,menu ul,dir ul,ol menu,ul menu,menu menu,dir menu,ol dir,ul dir,menu dir,dir dir{list-style-type:circle;} -/* 3 deep (or more) unordered lists use a square */ -ol ol ul,ol ul ul,ol menu ul,ol dir ul,ol ol menu,ol ul menu,ol menu menu,ol dir menu,ol ol dir,ol ul dir,ol menu dir,ol dir dir,ul ol ul,ul ul ul,ul menu ul,ul dir ul,ul ol menu,ul ul menu,ul menu menu,ul dir menu,ul ol dir,ul ul dir,ul menu dir,ul dir dir,menu ol ul,menu ul ul,menu menu ul,menu dir ul,menu ol menu,menu ul menu,menu menu menu,menu dir menu,menu ol dir,menu ul dir,menu menu dir,menu dir dir,dir ol ul,dir ul ul,dir menu ul,dir dir ul,dir ol menu,dir ul menu,dir menu menu,dir dir menu,dir ol dir,dir ul dir,dir menu dir,dir dir dir{list-style-type:square;} -.hidden{display:none;} -p{line-height:1.5em;} -h1{font-size:1.75em;/* 28px */ -line-height:1.7em;font-family:helvetica,verdana;} -h2{font-size:1.5em;/* 24px */ -line-height:1.7em;font-family:helvetica,verdana;} -h3{font-size:1.25em;/* 20px */ -line-height:1.7em;font-family:helvetica,verdana;} -h4{font-size:1em;line-height:1.7em;font-family:helvetica,verdana;} -html,body{width:100%;height:100%;} -body{margin:0;padding:0;background-color:#ffffff;position:relative;font:16px/24px "Nobile","Lucida Grande",Lucida,Verdana,sans-serif;} -a{color:#1b61d6;text-decoration:none;} -a:hover{color:#e88f00;text-decoration:underline;} -body h1, -body h2, -body h3, -body h4, -body h5, -body h6{font-family:"Nobile","Lucida Grande",Lucida,Verdana,sans-serif;font-weight:normal;color:#144fb2;font-style:normal;} -#header,#footer{width:100%;color:#ffffff;height:40px;position:absolute;text-align:center;line-height:40px;overflow:hidden;font-size:12px;} -#header{background-color:#e88f00;top:0;font-size:14px;} -#footer{background-color:#000000;bottom:0;} -.header,.footer{width:700px;margin-right:auto;margin-left:auto;} -.wrapper{width:100%} -#top,#bottom{width:100%;} -#top{color:#888;background-color:#eee;height:300px;border-bottom:2px solid #ddd;} -#bottom{color:#222;background-color:#ffffff;} -.top,.bottom{width:700px;margin-right:auto;margin-left:auto;} -.top{padding-top:100px;} -.app-welcome{margin-top:25px;} -.app-name{color:#000000;font-weight:bold;} -.bottom{padding-top:50px;} -#left{width:325px;float:left;padding-right:25px;} -#right{width:325px;float:right;padding-left:25px;} -.align-left{text-align:left;} -.align-right{text-align:right;} -.align-center{text-align:center;} -ul.links{margin:0;padding:0;} -ul.links li{list-style-type:none;font-size:14px;} -form{border-style:none;} -fieldset{border-style:none;} -input{color:#222;border:1px solid #ccc;font-family:sans-serif;font-size:12px;line-height:16px;} -input[type=text]{} -input[type=submit]{background-color:#ddd;font-weight:bold;} diff --git a/docs/narr/project.rst b/docs/narr/project.rst index 25e607174..15b9bfde5 100644 --- a/docs/narr/project.rst +++ b/docs/narr/project.rst @@ -437,18 +437,18 @@ share a similar structure. The ``MyProject`` project we've generated has the following directory structure:: - MyProject + MyProject/ |-- CHANGES.txt |-- development.ini |-- myproject | |-- __init__.py | |-- models.py + | |-- static + | | |-- favicon.ico + | | |-- logo.png + | | `-- pylons.css | |-- templates - | | |-- mytemplate.pt - | | `-- static - | | |-- favicon.ico - | | |-- logo.png - | | `-- pylons.css + | | `-- mytemplate.pt | |-- tests.py | `-- views.py |-- README.txt @@ -668,15 +668,14 @@ tarball to other people who want to use your application. .. warning:: - By default, ``setup.py sdist`` does not place non-Python-source - files in generated tarballs. This means, in this case, that the - ``templates/mytemplate.pt`` file and the files in the - ``templates/static`` directory are not packaged in the tarball. To - allow this to happen, check all the files that you'd like to be - distributed along with your application's Python files into a - version control system such as Subversion. After you do this, when - you rerun ``setup.py sdist``, all files checked into the version - control system will be included in the tarball. + By default, ``setup.py sdist`` does not place non-Python-source files in + generated tarballs. This means, in this case, that the + ``templates/mytemplate.pt`` file and the files in the ``static`` directory + are not packaged in the tarball. To allow this to happen, check all the + files that you'd like to be distributed along with your application's + Python files into a version control system such as Subversion. After you + do this, when you rerun ``setup.py sdist``, all files checked into the + version control system will be included in the tarball. ``setup.cfg`` ~~~~~~~~~~~~~ @@ -764,8 +763,8 @@ also informs Python that the directory which contains it is a *package*. it actually points to is a :term:`Chameleon` ZPT template file. Line 15 registers a static view, which will serve up the files from the - ``mypackage:templates/static`` :term:`resource specification` (the - ``templates/static`` directory of the ``mypackage`` package). + ``mypackage:static`` :term:`resource specification` (the ``static`` + directory of the ``mypackage`` package). Line 17 returns a :term:`WSGI` application to the caller of the function (Paste). @@ -844,6 +843,15 @@ make any assumption about which sort of datastore you'll want to use, so the sample application uses an instance of :class:`myproject.models.MyModel` to represent the root. +``static`` +~~~~~~~~~~~~~~~~~~~~ + +This directory contains static resources which support the +``mytemplate.pt`` template. It includes CSS and images. + +.. index:: + single: tests.py + ``templates/mytemplate.pt`` ~~~~~~~~~~~~~~~~~~~~~~~~~~~ @@ -857,15 +865,6 @@ Templates are accessed and used by view configurations and sometimes by view functions themselves. See :ref:`templates_used_directly` and :ref:`templates_used_as_renderers`. -``templates/static`` -~~~~~~~~~~~~~~~~~~~~ - -This directory contains static resources which support the -``mytemplate.pt`` template. It includes CSS and images. - -.. index:: - single: tests.py - ``tests.py`` ~~~~~~~~~~~~ -- cgit v1.2.3