diff --git a/cao_osint.egg-info/PKG-INFO b/cao_osint.egg-info/PKG-INFO index f93198a..bc0e30a 100644 --- a/cao_osint.egg-info/PKG-INFO +++ b/cao_osint.egg-info/PKG-INFO @@ -15,12 +15,12 @@ Requires-Dist: pyramid Requires-Dist: pyramid_jinja2 Requires-Dist: pyramid_debugtoolbar Requires-Dist: waitress -Requires-Dist: alembic +Requires-Dist: alembic==1.4.2 Requires-Dist: pyramid_retry Requires-Dist: pyramid_layout Requires-Dist: pyramid_tm Requires-Dist: python-magic -Requires-Dist: SQLAlchemy +Requires-Dist: SQLAlchemy==1.4.49 Requires-Dist: transaction Requires-Dist: zope.sqlalchemy Requires-Dist: wtforms diff --git a/cao_osint.egg-info/requires.txt b/cao_osint.egg-info/requires.txt index 5910576..640960a 100644 --- a/cao_osint.egg-info/requires.txt +++ b/cao_osint.egg-info/requires.txt @@ -3,12 +3,12 @@ pyramid pyramid_jinja2 pyramid_debugtoolbar waitress -alembic +alembic==1.4.2 pyramid_retry pyramid_layout pyramid_tm python-magic -SQLAlchemy +SQLAlchemy==1.4.49 transaction zope.sqlalchemy wtforms diff --git a/cao_osint.sqlite b/cao_osint.sqlite index c864666..9eba742 100644 Binary files a/cao_osint.sqlite and b/cao_osint.sqlite differ diff --git a/cao_osint/services/blog_record.py b/cao_osint/services/blog_record.py index 46283f2..2a254b5 100644 --- a/cao_osint/services/blog_record.py +++ b/cao_osint/services/blog_record.py @@ -25,13 +25,13 @@ class BlogRecordService(object): return query.get(_id) @classmethod - def get_last_created(cls, request): - # gest the 10 last created posts + def get_last_edited(cls, request): + # gest the 10 last edited posts query = request.dbsession.query(BlogRecord) if request.authenticated_userid == None: # if user is anonym, display only published posts query = query.filter(BlogRecord.status == 'publiƩ') - query = query.order_by(sa.desc(BlogRecord.created)).limit(10).all() + query = query.order_by(sa.desc(BlogRecord.edited)).limit(10).all() return query @classmethod diff --git a/cao_osint/static/theme.css b/cao_osint/static/theme.css index 302815a..af05fee 100644 --- a/cao_osint/static/theme.css +++ b/cao_osint/static/theme.css @@ -83,7 +83,7 @@ h3, h4 { .navbar { font-family: Montserrat, sans-serif; margin-bottom: 0; - background-color: #bc2131; + background-color: #2F4F4F; border: 0; font-size: 14px !important; letter-spacing: 4px; @@ -103,7 +103,7 @@ h3, h4 { border-color: transparent; } footer { - background-color: #bc2131; + background-color: #2F4F4F; color: #f5f5f5; padding: 32px; } diff --git a/cao_osint/templates/home.jinja2 b/cao_osint/templates/home.jinja2 index 50c91c5..96885a3 100644 --- a/cao_osint/templates/home.jinja2 +++ b/cao_osint/templates/home.jinja2 @@ -11,7 +11,7 @@ {% for entry in last_ten %} - + @@ -27,28 +27,6 @@ {% endfor %}
{{ entry.created.strftime("%d.%m.%Y") }}{{ entry.edited.strftime("%d.%m.%Y") }} {{ entry.title }}
- -
-
-
-
- -
-
- -
- {{ form.criteria(class_='form-control') }} - - - -
- {% for error in form.criteria.errors %} -
{{ error }}
- {% endfor %} -
-
{% endblock %} diff --git a/cao_osint/views/default.py b/cao_osint/views/default.py index 64b6ac5..9a918ae 100644 --- a/cao_osint/views/default.py +++ b/cao_osint/views/default.py @@ -16,16 +16,12 @@ import magic @view_config(route_name='home', renderer='../templates/home.jinja2', permission='view') def home(request): # get the last created posts - last_ten = BlogRecordService.get_last_created(request) + last_ten = BlogRecordService.get_last_edited(request) - criteria = '' - form = BlogSearchForm(request.POST) return { 'page_title': "", 'last_ten': last_ten, - 'form': form, - 'criteria': criteria, } diff --git a/setup.py b/setup.py index dea6ea6..1a3cbfb 100644 --- a/setup.py +++ b/setup.py @@ -14,12 +14,12 @@ requires = [ 'pyramid_jinja2', 'pyramid_debugtoolbar', 'waitress', - 'alembic', + 'alembic==1.4.2', 'pyramid_retry', 'pyramid_layout', 'pyramid_tm', 'python-magic', - 'SQLAlchemy', + 'SQLAlchemy==1.4.49', 'transaction', 'zope.sqlalchemy', 'wtforms', # form library 2.2.1