Added some MarkDown fixes

odmf/webpage/datafiles/wiki/help.wiki

@@ -1,97 +1,97 @@
-Markdown - a simple way to format web content
-------------------------
-
-
-In some places, eg. comments [Markdown][1] syntax can be used to 
-enhance the appearance of the text. **But you don't need to care!**
-
-This help page is written using Markdown, click on edit to see the source code
-
-
-
-Creating links
---------------------
-
- * `file:user/index.html` links to a file on the server. Use this to link to manuals, thesis etc. ==> file:user/index.html 
- * `dir:user/philipp` links to a directory on the server ==> dir:user/philipp 
- * `ds370` links to a dataset ==> ds370 
- * `#18` links to a site ==> #18
- * `job:1` links to a job ==> job:1
- * `wiki:help` links to a file /wiki/help (this one): wiki:help
- * `photo:1` links to a photo ==> photo:1
- * `![title](/picture/thumbnail/1)`inserts a small version of a photo ==> ![title](/picture/thumbnail/1)
- * `user:philipp` links to a user page ==> user:philipp
- * `[link name](http://uni-giessen.de)` links to another web site. ==> [link name](http://uni-giessen.de)
- * `[title](/map)` links to a location on this site ==> [title](/map)
- * Just write the link address - it will be converted automatically to a link, eg. http://uni-giessen.de
-
-
-
-Formatting
----------------
-
- * Starting a line with \* can be used for a list. Like this one.
- * You can *emphasize* or **strong emphazise** text in this way: `*emphasize*` or `**strong emphazise**`
- * You can insert a line break by doing two line breaks in your text
- * You can insert a horizontal line by `------` on a single line 
- * You can use arrows like this `--> ==> <-- <==` to get this --> ==> <-- <==
- * You can insert warnings, errors and boxes. See below.
- * You can do some more stuff with Markdown, have a look [here][1] and [here][2] or at the [source for 
-    this page][3] 
-
-Formatted boxes
-----------------
-
-### Warning:
-
-Writing:
-
-	!!! warning "A warning"
-	    And some more text  
-
-Results in:
-
-!!! warning "A warning"
-    And some more text  
-
-### Error:
-  
-Writing:
-
-	!!! error "An error"
-	    And some more text  
-
-Results in:
-
-!!! error "An error"
-    And some more text  
-
-### Box:
-  
-Writing:
-
-	!!! box "A box"
-	    And some more text  
-
-Results in:
-
-!!! box "A box"
-    And some more text  
-
-
-Videos
-----------------
-
-* Use `video:path/to/video.mp4` to include a normal html5 video. Result will be:
-
-video:http://fb09-pasig.umwelt.uni-giessen.de/sbapp2/assets/so_fliesst_sb.mp4
-
-* Use `alpha-video:path/to/video.mp4` to include a alpha-transparent video which gets encoded to a transparent video. Result will be:
-alpha-video:http://fb09-pasig.umwelt.uni-giessen.de/sbapp2/assets/Lutz_wald.mp4
-
-
--------
-
- [1]: http://de.wikipedia.org/wiki/Markdown
- [2]: http://daringfireball.net/projects/markdown/syntax
- [3]: /markdown.help?source=True
+Markdown - a simple way to format web content
+------------------------
+
+
+In some places, eg. comments [Markdown][1] syntax can be used to 
+enhance the appearance of the text. **But you don't need to care!**
+
+This help page is written using Markdown, click on edit to see the source code
+
+
+
+Creating links
+--------------------
+
+ * `file:user/index.html` links to a file on the server. Use this to link to manuals, thesis etc. ==> file:user/index.html 
+ * `dir:user/philipp` links to a directory on the server ==> dir:user/philipp 
+ * `ds370` links to a dataset ==> ds370 
+ * `#18` links to a site ==> #18
+ * `job:1` links to a job ==> job:1
+ * `wiki:help` links to a file /wiki/help (this one): wiki:help
+ * `photo:1` links to a photo ==> photo:1
+ * `![title](/picture/thumbnail/1)`inserts a small version of a photo ==> ![title](/picture/thumbnail/1)
+ * `user:philipp` links to a user page ==> user:philipp
+ * `[link name](http://uni-giessen.de)` links to another web site. ==> [link name](http://uni-giessen.de)
+ * `[title](/map)` links to a location on this site ==> [title](/map)
+ * Just write the link address - it will be converted automatically to a link, eg. http://uni-giessen.de
+
+
+
+Formatting
+---------------
+
+ * Starting a line with \* can be used for a list. Like this one.
+ * You can *emphasize* or **strong emphazise** text in this way: `*emphasize*` or `**strong emphazise**`
+ * You can insert a line break by doing two line breaks in your text
+ * You can insert a horizontal line by `------` on a single line 
+ * You can use arrows like this `--> ==> <-- <==` to get this --> ==> <-- <==
+ * You can insert warnings, errors and boxes. See below.
+ * You can do some more stuff with Markdown, have a look [here][1] and [here][2] or at the [source for 
+    this page][3] 
+
+Formatted boxes
+----------------
+
+### Warning:
+
+Writing:
+
+	!!! warning "A warning"
+	    And some more text  
+
+Results in:
+
+!!! warning "A warning"
+    And some more text  
+
+### Error:
+  
+Writing:
+
+	!!! error "An error"
+	    And some more text  
+
+Results in:
+
+!!! error "An error"
+    And some more text  
+
+### Box:
+  
+Writing:
+
+	!!! box "A box"
+	    And some more text  
+
+Results in:
+
+!!! box "A box"
+    And some more text  
+
+
+Videos
+----------------
+
+* Use `video:path/to/video.mp4` to include a normal html5 video. Result will be:
+
+video:http://fb09-pasig.umwelt.uni-giessen.de/sbapp2/assets/so_fliesst_sb.mp4
+
+* Use `alpha-video:path/to/video.mp4` to include a alpha-transparent video which gets encoded to a transparent video. Result will be:
+alpha-video:http://fb09-pasig.umwelt.uni-giessen.de/sbapp2/assets/Lutz_wald.mp4
+
+
+-------
+
+ [1]: http://de.wikipedia.org/wiki/Markdown
+ [2]: http://daringfireball.net/projects/markdown/syntax
+ [3]: /markdown.help?source=True

odmf/webpage/pages.py

@@ -319,7 +319,7 @@ def default(self, jobid=None, user=None, onlyactive='active'):
         if user != 'all':
             jobs = jobs.filter(db.Job._responsible == user)
         if onlyactive:
-            jobs = jobs.filter(not db.Job.done)
+            jobs = jobs.filter(~db.Job.done)
         result = web.render('job.html', jobs=jobs, job=job, error=error, db=db,
                             username=user, onlyactive=onlyactive, **queries
                             ).render('html', doctype='html')

requirements.txt

@@ -1,5 +1,5 @@
 # may be outdated
-
+wheel
 bcrypt
 chardet
 Pillow>=5.3.0
@@ -11,7 +11,7 @@ matplotlib
 pandas==0.13.1
 psycopg2==2.7.4
 pytz==2016.10
-sqlalchemy>=1.3.0
+sqlalchemy>=1.3.0,<2.0.0
 xlrd==1.0.0
 bleach
 MarkdownSuperscript