Commit aeb72ea0 authored by LE GAC Renaud's avatar LE GAC Renaud
Browse files

Migrate to plugin_dbui 0.6.1.0 (lazy_tables, about, documentations,

versions).
parent 72ed3bc6
""" Controllers """ """ Controllers """
import os
def about():
fn = os.path.join("applications",
request.application,
"static",
"ABOUT.html")
return open(fn, 'rb').read()
def documentations():
di = {}
di["epydoc_dbui"] = URL('static', 'plugin_dbui/docs/epydoc/index.html')
di["epydoc_application"] = URL('static', 'docs/epydoc/index.html')
di["js_mathjax"] = URL('static', 'plugin_mathjax/docs/html/index.html')
di["jsduck_dbui"] = URL('static', 'plugin_dbui/docs/jsduck/index.html')
di["png_db"] = URL('static', 'docs/database.png')
return di
@auth.requires_login() @auth.requires_login()
def index(): def index():
"""Main Controller to run the application launching the plugin dbui. """Main Controller to run the application launching the plugin dbui.
...@@ -59,11 +36,3 @@ def user(): ...@@ -59,11 +36,3 @@ def user():
to decorate functions that need access control to decorate functions that need access control
""" """
return dict(form=auth()) return dict(form=auth())
def versions():
""" expose http://.../default/versions and show software versions.
"""
import plugin_dbui
return plugin_dbui.get_versions()
...@@ -112,6 +112,7 @@ ...@@ -112,6 +112,7 @@
'History': 'Historique', 'History': 'Historique',
'Id': 'Id', 'Id': 'Id',
'Initials': 'Initiales', 'Initials': 'Initiales',
'install': 'installé',
'Invalid email': 'Invalid email', 'Invalid email': 'Invalid email',
'Invalid login': 'Invalid login', 'Invalid login': 'Invalid login',
'Is Active': 'Is Active', 'Is Active': 'Is Active',
...@@ -175,7 +176,7 @@ ...@@ -175,7 +176,7 @@
'Phd Date': 'Phd Date', 'Phd Date': 'Phd Date',
'Phd defense date': 'Date de la soutenance de la thèse', 'Phd defense date': 'Date de la soutenance de la thèse',
'please input your password again': 'please input your password again', 'please input your password again': 'please input your password again',
'plugin not install': 'plugin not install', 'plugin not install': 'greffon pas installé',
'Profile': 'Profile', 'Profile': 'Profile',
'Project': 'Projet', 'Project': 'Projet',
'project leader,...': 'project leader,...', 'project leader,...': 'project leader,...',
......
...@@ -18,7 +18,7 @@ ID_USER, USER, DEF_USER = 2, 'user', 'project leader,...' ...@@ -18,7 +18,7 @@ ID_USER, USER, DEF_USER = 2, 'user', 'project leader,...'
#------------------------------------------------------------------------------- #-------------------------------------------------------------------------------
# connection to the database # connection to the database
try: try:
db = DAL(DB_MYSQL, migrate_enabled=MIGRATE, pool_size=10) db = DAL(DB_MYSQL, lazy_tables=True, migrate_enabled=MIGRATE, pool_size=10)
except: except:
raise HTTP(500, T("Can't access the MySQL database !!!")) raise HTTP(500, T("Can't access the MySQL database !!!"))
...@@ -27,7 +27,7 @@ except: ...@@ -27,7 +27,7 @@ except:
# SQLITE database (test) # SQLITE database (test)
# #
#------------------------------------------------------------------------------- #-------------------------------------------------------------------------------
# db = DAL('sqlite://storage.sqlite', migrate_enabled=MIGRATE) # db = DAL('sqlite://storage.sqlite', lazy_tables=True, migrate_enabled=MIGRATE)
#------------------------------------------------------------------------------- #-------------------------------------------------------------------------------
# #
......
...@@ -66,9 +66,9 @@ dataPeopleNode.add_child(T('history'), to_grid('history')) ...@@ -66,9 +66,9 @@ dataPeopleNode.add_child(T('history'), to_grid('history'))
# HELP NODE # HELP NODE
# #
#------------------------------------------------------------------------------- #-------------------------------------------------------------------------------
aboutLeaf = Panel(autoLoad=URL('default', 'about'), autoScroll=True) aboutLeaf = Panel(autoLoad=URL('plugin_dbui', 'about'), autoScroll=True)
documentationsLeaf = Panel(autoLoad=URL('default', 'documentations'), autoScroll=True) documentationsLeaf = Panel(autoLoad=URL('plugin_dbui', 'documentations'), autoScroll=True)
versionLeaf = Panel(autoLoad=URL('default', 'versions')) versionLeaf = Panel(autoLoad=URL('plugin_dbui', 'versions'))
helpNode = Node(T('Help')) helpNode = Node(T('Help'))
helpNode.add_child(T('about'), aboutLeaf) helpNode.add_child(T('about'), aboutLeaf)
......
...@@ -41,6 +41,12 @@ ...@@ -41,6 +41,12 @@
<p class="my-p">Ce logiciel s'appuit sur les logiciels open source suivant :</p> <p class="my-p">Ce logiciel s'appuit sur les logiciels open source suivant :</p>
<ul class="my-ul"> <ul class="my-ul">
<li class="my-li">
<a href="http://ace.c9.io/" target="_blank">
Ace
</a>
</li>
<li class="my-li"> <li class="my-li">
<a href="http://www.sencha.com/" target="_blank"> <a href="http://www.sencha.com/" target="_blank">
Ext JS Ext JS
...@@ -73,7 +79,6 @@ ...@@ -73,7 +79,6 @@
<h3 class="my-h3 my-small-cap">Licence</h3> <h3 class="my-h3 my-small-cap">Licence</h3>
<p class="my-p">Ce logiciel est distribué sous la licence opence source <p class="my-p">Ce logiciel est distribué sous la licence opence source
<a href="http://www.cecill.info/" target="_blank">CeCILL</a>.</p> <a href="http://www.cecill.info/" target="_blank">CeCILL</a>.</p>
<br>
<p class="my-p">&copy; 2010 - 2014 Renaud Le Gac</p> <p class="my-p">&copy; 2010 - 2014 Renaud Le Gac</p>
</body> </body>
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment