few "fashion" tweaks plus sphinx over epydoc docs

2014-04-08 23:03:15 +02:00
parent 39ee2a5991
commit 0c30bc5d7d
7 changed files with 159 additions and 18 deletions
--- a/applications/examples/controllers/default.py
+++ b/applications/examples/controllers/default.py
@@ -10,12 +10,12 @@ session.forget()
 cache_expire = not request.is_local and 300 or 0


-@cache('index', time_expire=cache_expire)
+@cache.action(time_expire=300, cache_model=cache.ram, quick='P')
 def index():
    return response.render()


-@cache('what', time_expire=cache_expire)
+@cache.action(time_expire=300, cache_model=cache.ram, quick='P')
 def what():
    import urllib
    try:
@@ -26,27 +26,27 @@ def what():
    return response.render(images=images)


-@cache('download', time_expire=cache_expire)
+@cache.action(time_expire=300, cache_model=cache.ram, quick='P')
 def download():
    return response.render()


-@cache('who', time_expire=cache_expire)
+@cache.action(time_expire=300, cache_model=cache.ram, quick='P')
 def who():
    return response.render()


-@cache('support', time_expire=cache_expire)
+@cache.action(time_expire=300, cache_model=cache.ram, quick='P')
 def support():
    return response.render()


-@cache('documentation', time_expire=cache_expire)
+@cache.action(time_expire=300, cache_model=cache.ram, quick='P')
 def documentation():
    return response.render()


-@cache('usergroups', time_expire=cache_expire)
+@cache.action(time_expire=300, cache_model=cache.ram, quick='P')
 def usergroups():
    return response.render()

@@ -55,7 +55,7 @@ def contact():
    redirect(URL('default', 'usergroups'))


-@cache('videos', time_expire=cache_expire)
+@cache.action(time_expire=300, cache_model=cache.ram, quick='P')
 def videos():
    return response.render()

@@ -68,7 +68,7 @@ def api():
    redirect('http://www.web2py.com/book/default/chapter/04#API')


-@cache('license', time_expire=cache_expire)
+@cache.action(time_expire=300, cache_model=cache.ram, quick='P')
 def license():
    import os
    filename = os.path.join(request.env.gluon_parent, 'LICENSE')
@@ -83,12 +83,12 @@ def version():
        a,b,c,build.year,build.month,build.day,
        build.hour,build.minute,build.second,pre_release)

-@cache('examples', time_expire=cache_expire)
+@cache.action(time_expire=300, cache_model=cache.ram, quick='P')
 def examples():
    return response.render()


-@cache('changelog', time_expire=cache_expire)
+@cache.action(time_expire=300, cache_model=cache.ram, quick='P')
 def changelog():
    import os
    filename = os.path.join(request.env.gluon_parent, 'CHANGELOG')
--- a/applications/examples/private/content/en/default/documentation/official.markmin
+++ b/applications/examples/private/content/en/default/documentation/official.markmin
@@ -6,4 +6,4 @@
 - [[web2py Application Development Cookbook http://www.packtpub.com/web2py-application-development-recipes-to-master-python-web-framework-cookbook/book?utm_source=web2py.com&utm_medium=link&utm_content=pod&utm_campaign=mdb_009617]]
 - [[Quick Examples http://www.web2py.com/examples/default/examples]]
 - [[API http://web2py.com/book/default/chapter/04#API popup]]
- [[Epydoc (source code documentation) http://www.web2py.com/examples/static/epydoc/index.html popup]]
+- [[Sphinx (source code documentation) http://web2py.readthedocs.org/en/latest/ popup]]
--- a/applications/examples/private/content/en/default/what/whyweb2py.markmin
+++ b/applications/examples/private/content/en/default/what/whyweb2py.markmin
@@ -3,7 +3,7 @@
 - **Created by a community of professionals** and University professors in Computer Science and Software Engineering.
 - **Always backward compatible.** We have not broken backward compatibility since version 1.0 in 2007, and we pledge not to break it in the future.
 - **Easy to run.** It requires no installation and no configuration.
- **Runs on** Windows, Mac, Unix/Linux, Google App Engine, Amazon EC2, and almost any web hosting via Python 2.5/2.6/2.7, or Java with Jython.
+- **Runs on** Windows, Mac, Unix/Linux, Google App Engine, Amazon EC2, and almost any web hosting via Python 2.5/2.6/2.7/pypy, or Java with Jython.
 - **Runs with** Apache, Lighttpd, Cherokee and almost any other web server via CGI, FastCGI, WSGI, mod_proxy, and/or mod_python. It can embed third party WSGI apps and middleware.
 - **Talks to** SQLite, PostgreSQL, MySQL, MSSQL, FireBird, Oracle, IBM DB2, Informix, Ingres, and Google App Engine. 
 - **Secure** [[It prevents the most common types of vulnerabilities http://web2py.com/examples/default/security]] including Cross Site Scripting, Injection Flaws, and Malicious File Execution.
--- a/applications/examples/static/css/artwork.css
+++ b/applications/examples/static/css/artwork.css
@@ -0,0 +1,141 @@
+
+/*---------------------------------- ARTWORK E STICKERS -----------------------------------------*/
+/*logo*/
+.logosDow{
+	border-width: 1px;
+	border-style: solid;
+	border-color:#CCC;
+	border-radius:3px;
+	background-color:#FFF;
+	-webkit-border-radius: 3px;
+	-moz-border-radius:3px;
+	margin:20px auto;
+	background: -moz-linear-gradient(top, #fbfbfb, #f1f1f1) repeat-X;
+	background: -webkit-gradient(linear, left top, left bottom, from(#fbfbfb), to(#f1f1f1)) repeat-X;
+	-ms-filter: "progid:DXImageTransform.Microsoft.gradient(startColorstr=#666, endColorstr=#FFFFFFFF)";
+	filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#fbfbfb, endColorstr=#f1f1f1);
+	border-width: 1px;
+	border-style: solid;
+	border-color:#CCC;
+	border-radius:3px;
+	background-color:#FFF;
+	-webkit-border-radius: 3px;
+	-moz-border-radius:3px;
+	width:100%;
+	
+	padding:10px 10px 0 10px;
+	padding-bottom:0
+	}
+.WH1{
+	height:190px;
+	}	
+.WH2{
+	height:90px;
+	
+	}		
+.logosDow span{
+	margin:8px 15px;
+	float:left;
+	width:700px; height:20px;
+	color:#555555;
+	font:bold 18px/30px Arial,Helvetica,sans-serif;
+	letter-spacing:-1px;
+}
+.box-A{
+	margin:10px;	
+	float:left;
+	border-width: 1px;
+	border-style: solid;
+	border-color:#CCC;
+	border-radius:3px;
+	background-color:#FFF;
+	-webkit-border-radius: 3px;
+	-moz-border-radius:3px;
+	width:250px; height:130px;
+}
+a.box-A span{
+	display:none;
+	position:relative;
+        top:-55px;
+	left:-10px;
+	width:235px;
+	height:50px;
+	background-image:url(../img/tipDownloads2.png);
+	background-position:center;
+	background-repeat:no-repeat;
+}
+a.box-A:hover span{ 
+	display:block;
+}
+.logoDow1{
+	background-image:url(../img/logo3Tones.png);
+	background-repeat:no-repeat;
+	background-position:-10px -155px;
+}
+.logoDow2{
+	background-image:url(../img/logo3Tones.png);
+	background-repeat:no-repeat;
+	background-position:-10px 0px;
+}
+.logoDow3{
+	background-image:url(../img/logo3Tones.png);
+	background-repeat:no-repeat;
+	background-position:-10px -312px;
+}
+/*fim logo*/
+/*Stick*/
+.stikImage{
+	float:left;
+	width:100px;
+	height:50px;
+	margin-left:15px;
+	background-repeat:no-repeat;
+	background-position:center;
+	
+	}
+.stikimage1{
+	background-image:url(../img/Stickers1.png);
+	background-position:center;
+}
+.stikimage2{
+	background-image:url(../img/Stickers2.png);
+	background-position:center;
+}
+.stikimage3{
+	background-image:url(../img/Stickers3.png);
+	background-position:center;
+}
+.stikimage4{
+	background-image:url(../img/Stickers8.png);
+	background-position:center;
+}
+.stikimage5{
+	background-image:url(../img/Stickers5.png);
+	background-position:center;
+}
+.stikimage6{
+	background-image:url(../img/Stickers6.png);
+	background-position:center;
+}
+.stikimage7{
+	background-image:url(../img/Stickers7.png);
+	background-position:center;
+}
+a.stikImage span{
+     display:none;
+	position:relative;
+    top:-50px;
+	left:-50px;
+	width:180px;
+	height:50px;
+	background-image:url(../img/tipDownloads.png);
+	background-position:center;
+	background-repeat:no-repeat;
+}
+a.stikImage:hover span{ 
+	display:block;
+}
+/*fim do Stick*/
+
+/*------------------------------ FIM ARTWORK E STICKERS -----------------------------------------*/
+
--- a/applications/examples/views/default/download.html
+++ b/applications/examples/views/default/download.html
@@ -25,7 +25,7 @@
    <tr>
      <td><a class="btn btn-180 btn-success" href="http://www.web2py.com/examples/static/web2py_src.zip">Source Code</a></td>
      <td><a class="btn btn-180 btn-warning" href="http://www.web2py.com/examples/static/nightly/web2py_src.zip">Source Code</a></td>
-      <td><a class="btn btn-180 btn-danger" href="{{=URL('static', 'epydoc/index.html')}}">Epydoc</a></td>
+      <td><a class="btn btn-180 btn-danger" href="http://web2py.readthedocs.org/en/latest/">Source code docs</a></td>
    </tr>
    <tr>
      <td><a class="btn btn-180 btn-success" href="https://dl.dropbox.com/u/18065445/web2py/web2py_manual_5th.pdf">Manual</a></td>
@@ -43,9 +43,9 @@
 <h3>Instructions</h3>
 <p>After download, unzip it and click on web2py.exe (windows) or web2py.app (osx).
  To run from source, type:</p>
-{{=CODE("python2.5 web2py.py",language=None,counter='>',_class='boxCode')}}
+{{=CODE("python2.7 web2py.py",language=None,counter='>',_class='boxCode')}}
 <p>or for more info type:</p>
-{{=CODE("python2.5 web2py.py -h",language=None,counter='>',_class='boxCode')}}
+{{=CODE("python2.7 web2py.py -h",language=None,counter='>',_class='boxCode')}}


 <h3>Caveats</h3>
--- a/applications/examples/views/default/who.html
+++ b/applications/examples/views/default/who.html
@@ -120,7 +120,7 @@
 </li><li>Scott Roberts (testing, book)
 </li><li>Sergey Podlesnyi (Oracle and migrations tester)
 </li><li>Sharriff Aina (tester and PyAMF integration)
-</li><li>Simone Bizzotto (scheduler, redis)
+</li><li><a href="https://github.com/niphlod/">Simone Bizzotto</a> (scheduler, dal, redis, tests, sphinx)
 </li><li>Sriram Durbha (book)
 </li><li>Sterling Hankins (tester, book)
 </li><li>Stuart Rackham (MSSQL support)
--- a/applications/examples/views/global/vars.html
+++ b/applications/examples/views/global/vars.html
@@ -7,7 +7,7 @@
  <div align="right">
    [ <a href="http://docs.python.org/tut/">Python Tutorial</a> ]
    [ <a href="http://docs.python.org/lib/">Python Libraries</a> ]
-    [ <a href="/{{=request.application}}/static/epydoc/index.html">web2py epydoc</a> ]
+    [ <a href="http://web2py.readthedocs.org/en/latest/">web2py source docs</a> ]
  </div>
  
  <h2>{{=T('Description')}}</h2>