minor updates:

- fixed requirements.txt
- print statement removed
- wrong attribute handling fixed

emonitor/modules/alarms/__init__.py

@@ -80,7 +80,6 @@ def export_static(filename):
             filename, extension = os.path.splitext(filename)
             try:
                 id, template = filename.split('-')
-                print ">>>", id, template, extension
                 if extension not in ['.pdf', '.html', '.png']:
                     abort(404)
                 elif extension == '.pdf':

emonitor/modules/settings/templates/admin.settings.department_actions.html

@@ -70,7 +70,7 @@ <h2>{{ _('settings.department.edittitle') }}</h2>
                 {{ _('settings.department.logo.act') }}
                 <div id="previewcontainer">
                     <div id="dellink"><a href="#" onclick="return deleteLogo()"><i class="fa fa-trash-o fa-lg"></i></a></div>
-                    <div id="preview">{%- if department.attributes['logo'] !='' %}<img src="data:image/{{ department.attributes['logo'].split('.')[-1] }};base64,{{ department.getLogoStream() }}"/>{%- endif %}</div>
+                    <div id="preview">{%- if department.logo !='' %}<img src="data:image/{{ department.logo.split('.')[-1] }};base64,{{ department.getLogoStream() }}"/>{%- endif %}</div>
                 </div>
                 <p>
                     <input name="dep_logo" type="file" style="width:100%;" accept="image/*">
@@ -130,8 +130,7 @@ <h2>{{ _('settings.department.edittitle') }}</h2>
 
         var reader = new FileReader();
         reader.onload = (function(aImg) { return function(e) { aImg.src = e.target.result; }; })(img);
-        #reader.readAsDataURL(files[files.length -1]);
-        reader.readAsText(files[files.length -1]);
+        reader.readAsDataURL(files[files.length -1]);
     }
 
     function deleteLogo(){

requirements.txt

@@ -1,50 +1,57 @@
+alembic==0.7.5.post2
+amqp==1.4.6
+anyjson==0.3.3
 APScheduler==3.0.1
+argh==0.26.1
 Babel==1.3
+billiard==3.3.0.20
+blinker==1.3
+certifi==14.5.14
+cherrypy==3.6.0
+colorama==0.3.3
+docutils==0.12
 Flask==0.10.1
-Flask-Alembic==1.0.2
+Flask-Alembic==1.1.1
 Flask-Babel==0.9
+Flask-BabelEx==0.9.2
 Flask-Cache==0.13.1
 Flask-Login==0.2.11
-Flask-SQLAlchemy==1.0
-Flask-Script==2.0.5
-Jinja2==2.7.3
-Mako==1.0.0
-Markdown==2.5.2
-MarkupSafe==0.23
-Pillow==2.5.3
-PyPDF2==1.23
-PyYAML==3.11
-Pygments==2.0.1
-SQLAlchemy==0.9.7
-Sphinx==1.2.3
-Werkzeug==0.9.6
-XlsxWriter==0.5.7
-alembic==0.6.6
-amqp==1.4.6
-anyjson==0.3.3
-argh==0.26.1
-backports.ssl-match-hostname==3.4.0.2
-billiard==3.3.0.19
-blinker==1.3
-certifi==14.05.14
-docutils==0.12
+Flask-SQLAlchemy==2.0
 futures==2.2.0
+gevent-socketio==0.3.6
 ghp-import==0.4.1
+greenlet==0.4.5
 html5lib==1.0b3
 itsdangerous==0.24
 kombu==3.0.24
+Mako==1.0.1
+Markdown==2.6.2
+MarkupSafe==0.23
 pathtools==0.1.2
+pdfminer==20140328
 pdfrw==0.1
+Pillow==2.8.1
+protobuf==2.6.1
+py==1.4.26
+Pygments==2.0.2
 pypdf==1.13
-pytz==2014.10
-#reportlab==2.7
+PyPDF2==1.24
+pytest==2.7.0
+pytg==0.1
+pytz==2015.2
+PyYAML==3.11
+reportlab==3.1.44
 requests==2.5.1
-six==1.8.0
+rst2pdf===0.93.dev-r0
+six==1.9.0
 speaklater==1.3
-sphinx-rtd-theme==0.1.6
-tzlocal==1.1.2
-watchdog==0.8.2
+Sphinx==1.3.1
+sphinx-rtd-theme==0.1.7
+SQLAlchemy==1.0.0
+tzlocal==1.1.3
+watchdog==0.8.3
+Werkzeug==0.10.4
+ws4py==0.3.4
 xhtml2pdf==0.0.6
 xlrd==0.9.3
-cherrypy==3.6.0
-ws4py==0.3.4
+XlsxWriter==0.7.2