diginaut/digimarks
1
0
Fork 0
mirror of https://github.com/aquatix/digimarks.git synced 2025-12-06 22:05:09 +01:00
Code Issues Releases Wiki Activity

Merge pull request #13 from aquatix/materialize1.0

Browse Source 
Materialize1.0 and Python3
This commit is contained in:
Michiel Scholten
2017-12-17 11:51:24 +01:00
committed by GitHub
parent de5d4d30ef e35d9952bd
commit 48e77f551d
7 changed files with 15 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
digimarks.py
View File

@@ -6,6 +6,11 @@ import hashlib
import os import os
import shutil import shutil
import sys import sys
try:
# Python 3
from urllib.parse import urljoin, urlparse, urlunparse
except ImportError:
# Python 2
from urlparse import urljoin, urlparse, urlunparse from urlparse import urljoin, urlparse, urlunparse
import bs4 import bs4

4
requirements-dev.txt
View File

@@ -24,12 +24,12 @@ markupsafe==1.0 # via jinja2
mccabe==0.6.1 # via pylint mccabe==0.6.1 # via pylint
peewee==2.10.2 peewee==2.10.2
pkg-resources==0.0.0 pkg-resources==0.0.0
pylint==1.7.4 pylint==1.7.5
requests==2.18.4 requests==2.18.4
singledispatch==3.4.0.3 # via astroid, pylint singledispatch==3.4.0.3 # via astroid, pylint
six==1.11.0 # via astroid, pylint, singledispatch six==1.11.0 # via astroid, pylint, singledispatch
urllib3==1.22 # via requests urllib3==1.22 # via requests
werkzeug==0.12.2 # via flask, flask-peewee werkzeug==0.13 # via flask, flask-peewee
wrapt==1.10.11 # via astroid wrapt==1.10.11 # via astroid
wtf-peewee==0.2.6 # via flask-peewee wtf-peewee==0.2.6 # via flask-peewee
wtforms==2.1 # via flask-peewee, wtf-peewee wtforms==2.1 # via flask-peewee, wtf-peewee

2
requirements.in
View File

@@ -1,5 +1,3 @@
pkg-resources==0.0.0
flask flask
peewee peewee
flask-peewee flask-peewee

2
requirements.txt
View File

@@ -19,6 +19,6 @@ peewee==2.10.2
pkg-resources==0.0.0 pkg-resources==0.0.0
requests==2.18.4 requests==2.18.4
urllib3==1.22 # via requests urllib3==1.22 # via requests
werkzeug==0.12.2 # via flask, flask-peewee werkzeug==0.13 # via flask, flask-peewee
wtf-peewee==0.2.6 # via flask-peewee wtf-peewee==0.2.6 # via flask-peewee
wtforms==2.1 # via flask-peewee, wtf-peewee wtforms==2.1 # via flask-peewee, wtf-peewee

2
static/js/init.js
View File

@@ -1,7 +1,7 @@
(function($){ (function($){
$(function(){ $(function(){
$('.button-collapse').sideNav(); $('.sidenav').sidenav();
}); // end of document ready }); // end of document ready
})(jQuery); // end of jQuery name space })(jQuery); // end of jQuery name space

8
templates/base.html
View File

@@ -17,7 +17,7 @@
<link href="https://fonts.googleapis.com/icon?family=Material+Icons" rel="stylesheet"> <link href="https://fonts.googleapis.com/icon?family=Material+Icons" rel="stylesheet">
<link href='https://fonts.googleapis.com/css?family=Roboto+Mono&subset=latin,latin-ext' rel='stylesheet' type='text/css'> <link href='https://fonts.googleapis.com/css?family=Roboto+Mono&subset=latin,latin-ext' rel='stylesheet' type='text/css'>
<link href="https://cdnjs.cloudflare.com/ajax/libs/materialize/0.100.2/css/materialize.min.css" type="text/css" rel="stylesheet" media="screen,projection"/> <link href="https://cdnjs.cloudflare.com/ajax/libs/materialize/1.0.0-alpha.2/css/materialize.min.css" type="text/css" rel="stylesheet" media="screen,projection"/>
<style> <style>
.card-content a .card-content a
{ {
@@ -52,12 +52,12 @@
</ul> </ul>
{% if userkey %} {% if userkey %}
<ul id="nav-mobile" class="side-nav"> <ul id="nav-mobile" class="sidenav">
<li><a class="waves-effect" href="{{ url_for('bookmarks', userkey=userkey) }}"><i class="material-icons">turned_in</i>Home</a></li> <li><a class="waves-effect" href="{{ url_for('bookmarks', userkey=userkey) }}"><i class="material-icons">turned_in</i>Home</a></li>
<li><a class="waves-effect" href="{{ url_for('tags', userkey=userkey) }}"><i class="material-icons">label</i>Tags</a></li> <li><a class="waves-effect" href="{{ url_for('tags', userkey=userkey) }}"><i class="material-icons">label</i>Tags</a></li>
<li><a class="waves-effect" href="{{ url_for('addbookmark', userkey=userkey) }}"><i class="material-icons">add</i>Add bookmark</a></li> <li><a class="waves-effect" href="{{ url_for('addbookmark', userkey=userkey) }}"><i class="material-icons">add</i>Add bookmark</a></li>
</ul> </ul>
<a href="#" data-activates="nav-mobile" class="button-collapse"><i class="material-icons">menu</i></a> <a href="#" data-target="nav-mobile" class="sidenav-trigger"><i class="material-icons">menu</i></a>
{% endif %} {% endif %}
</div> </div>
</nav> </nav>
@@ -76,7 +76,7 @@
</div> </div>
<!-- Scripts --> <!-- Scripts -->
<script src="https://cdnjs.cloudflare.com/ajax/libs/materialize/0.100.2/js/materialize.min.js"></script> <script src="https://cdnjs.cloudflare.com/ajax/libs/materialize/1.0.0-alpha.2/js/materialize.min.js"></script>
<script src="{{ url_for('static', filename='js/init.js') }}"></script> <script src="{{ url_for('static', filename='js/init.js') }}"></script>
</body> </body>

1
templates/edit.html
View File

@@ -167,7 +167,6 @@
<script> <script>
$(function() { $(function() {
console.log('woei');
$('form.digimark').on('submit',function(){$("#submit").prop("disabled", true); return true;}) $('form.digimark').on('submit',function(){$("#submit").prop("disabled", true); return true;})
}); });
</script> </script>