[Pkg-debile-commits] [debile-web] 01/01: Merge remote-tracking branch 'origin/master' into update-usuability

[Sylvestre Ledru]

This is an automated email from the git hooks/post-receive script.

sylvestre pushed a commit to branch update-usuability
in repository debile-web.

commit 07a3c13e4dce2c19265ca69b30302421108d63be
Merge: 180e95b 3caf149
Author: Sylvestre Ledru <sylvestre.ledru at scilab-enterprises.com>
Date:   Tue Aug 27 15:41:01 2013 +0200

    Merge remote-tracking branch 'origin/master' into update-usuability
    
    Conflicts:
    	debileweb/blueprints/frontend.py

 PACKAGING                                          |   29 +++++++-------
 app.py                                             |    2 +-
 {debile => debileweb}/__init__.py                  |    0
 {debile => debileweb}/blueprints/__init__.py       |    0
 {debile => debileweb}/blueprints/frontend.py       |   41 +++++++++-----------
 {debile => debileweb}/core.py                      |    0
 setup.py                                           |    6 +--
 templates/about.html                               |   19 ---------
 templates/hacker.html                              |   23 +++++++++--
 templates/index.html                               |   14 ++-----
 templates/report.html                              |    2 +-
 templates/report_desc_binary.html                  |    6 +++
 templates/report_desc_source.html                  |    6 +++
 ...gment.html => report_list_binary_fragment.html} |    2 +
 templates/report_list_fragment.html                |   10 ++---
 templates/source.html                              |    4 ++
 16 files changed, 87 insertions(+), 77 deletions(-)

diff --cc app.py
index 3a61667,744ac93..aea61d8
--- a/app.py
+++ b/app.py
@@@ -19,10 -19,11 +19,10 @@@
  # DEALINGS IN THE SOFTWARE.
  
  from flask import Flask
- from debile.blueprints.frontend import frontend
+ from debileweb.blueprints.frontend import frontend
  
 -
  app = Flask(__name__)
 -
 +app.config.from_object('config')
  app.register_blueprint(frontend)
  
  
diff --cc debileweb/blueprints/frontend.py
index 0cb2e77,81e55e4..2525a50
--- a/debileweb/blueprints/frontend.py
+++ b/debileweb/blueprints/frontend.py
@@@ -17,16 -17,13 +17,15 @@@
  # LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
  # FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  # DEALINGS IN THE SOFTWARE.
- 
 +from flask import Blueprint, render_template, send_file, request, redirect
 +from flask.ext.jsonpify import jsonify
 +
 +from sqlalchemy.orm import joinedload, cast
  
- from lucy.orm import Package, Source, Binary, Machine, User, Job, Group
- from lucy.archive import UserRepository
- from lucy.config import Config
- from lucy.server import Session
 -from flask import Blueprint, render_template, send_file
 -from sqlalchemy.orm import joinedload
+ from debilemaster.orm import Package, Source, Binary, Machine, User, Job, Group
+ from debilemaster.config import Config
+ from debilemaster.server import Session
+ from debilemaster.archive import UserRepository
  
  from humanize import naturaltime
  from humanize.time import naturaldelta
@@@ -97,14 -94,10 +96,13 @@@ def index()
      pending_jobs = session.query(Job)\
          .filter(Job.assigned_at == None)\
          .count()
 +
 +    form = SearchPackageForm()
- 
      return render_template('index.html', **{
          "active_jobs_info": active_jobs_info,
 -        "pending_jobs": pending_jobs
 +        "pending_jobs": pending_jobs,
 +        "form": form
-         })
+     })
  
  
  @frontend.route("/sources/")

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-debile/debile-web.git