From 3ba5d6820d9bf9a05b512e49da058d5c588259ab Mon Sep 17 00:00:00 2001 From: deflax Date: Mon, 12 Jun 2017 05:12:27 +0300 Subject: [PATCH] footer work --- app/admin/routes.py | 2 +- app/news/routes.py | 2 +- app/static/css/style.css | 45 +++++++++++++++----- app/static/images/fb.png | Bin 0 -> 981 bytes app/templates/admin/list_items.html | 2 +- app/templates/admin/list_transactions.html | 4 +- app/templates/admin/list_users.html | 2 +- app/templates/errors/403.html | 20 ++++++--- app/templates/errors/404.html | 46 ++++++++++----------- app/templates/errors/500.html | 3 +- app/templates/errors/csrf_error.html | 16 ++++--- app/templates/footer_colored.html | 6 ++- app/templates/footer_index.html | 30 ++++++-------- app/templates/footer_simple.html | 4 +- app/templates/nav.html | 2 +- app/templates/news/latest.html | 9 ++-- app/templates/settings/acc_info.html | 2 +- app/templates/uinvoice/transactions.html | 8 ++-- app/templates/vmanager/dashboard.html | 16 +++---- 19 files changed, 126 insertions(+), 93 deletions(-) create mode 100644 app/static/images/fb.png diff --git a/app/admin/routes.py b/app/admin/routes.py index f894cd0..b96b81a 100644 --- a/app/admin/routes.py +++ b/app/admin/routes.py @@ -42,7 +42,7 @@ def list_items(): @login_required @admin_required def list_users(): - allusers = User.query.order_by(User.pid.asc()).all() + allusers = User.query.order_by(User.last_seen.desc()).all() return render_template('admin/list_users.html', users=allusers) @admin.route("/charge/", methods=['GET', 'POST']) diff --git a/app/news/routes.py b/app/news/routes.py index fb53be6..5e914d7 100644 --- a/app/news/routes.py +++ b/app/news/routes.py @@ -31,7 +31,7 @@ def all(): def latest(): graph = GraphAPI(get_fb_token()) page_id = current_app.config['FB_PAGE_ID'] - latest = graph.get(page_id+'/posts?limit=1&fields=id,message,created_time,link', page=True, retry=3) + latest = graph.get(page_id+'/posts?limit=2&fields=id,message,created_time,link', page=True, retry=3) posts = [] for data in latest: posts.append(data) diff --git a/app/static/css/style.css b/app/static/css/style.css index 0b8df70..e933c57 100644 --- a/app/static/css/style.css +++ b/app/static/css/style.css @@ -17,7 +17,7 @@ body { } .page_wrap { - width: 1140px; + width: 70%; margin: 0 auto; } @@ -30,13 +30,16 @@ body { margin-top: 40px; } -.one_four { - float: left; - width: 210px; - margin-right: 84px; +.clear{ + clear:both; } -.one_four h4 { +.footerblock { + max-width: 420px; + margin-right: 0px; +} + +.footerblock h4 { font-size: 18px; color: #FFF; background: url(/static/images/footer_cols_divider.png) no-repeat bottom center; @@ -263,8 +266,30 @@ a:active { border-top-right-radius: 3px; } -.tooltip-inner { - max-width: 350px; - /* If max-width does not work, try using width instead */ - width: 350px; +.rrd + .tooltip > .tooltip-inner { + background-color: #73AD21; + color: #FFFFFF; + border: 1px solid green; + padding: 15px; + font-size: 20px; +} + +/* Tooltip on top */ +.rrd + .tooltip.top > .tooltip-arrow { + border-top: 5px solid green; +} + +/* Tooltip on bottom */ +.rrd + .tooltip.bottom > .tooltip-arrow { + border-bottom: 5px solid blue; +} + +/* Tooltip on left */ +.rrd + .tooltip.left > .tooltip-arrow { + border-left: 5px solid red; +} + +/* Tooltip on right */ +.rrd + .tooltip.right > .tooltip-arrow { + border-right: 5px solid black; } diff --git a/app/static/images/fb.png b/app/static/images/fb.png new file mode 100644 index 0000000000000000000000000000000000000000..edf4393376a4c623424e1e5a17defe6c8c05d5c6 GIT binary patch literal 981 zcmV;`11kK9P)i8XOV9?}Y}9Iv{E$`ZDuA>SWQ??^WHd?ip7W({xwydd|J)o^z`jKJv)I$yz!Y%Lo}CT2lnO#n%mzbC+xiL9pRS>i!BVHs>xCsQUVnxg zfG2~=kjNR3P;sxUb1XRIXziKe+tv(Yqm4+}?ZqB{{P~n#NrV9t&H+Av9F(B$A&>>n z@4IH#arodDWRZ`CV;TDWg%1Fc|5>UNLX*f4-?U~b!GQq0N(=e_9F`!W-h#(LOpZ6% zw0?C2c;?a*uFO5B+wJ3=qtokEgBQXLOYk8cU$d&gNMo4(zwIuk&Of5l?WchZ6Icdv zm9t`x<26%^PPb3D*Qc89v=C7!!l3i5#N%@Lj4ma<^T^?Afs=ALu;#xo?bdBb=V!25QW z6Q^&{@4KXa%G-3w1-9L$UN-EQ;SA+e);`c!=mM*O<(f%6QtzhS6gjP6Aoni`)z(P`{BIb9>m*)#d`3f(HQ{>|7CROhjSYwy^vh9whw%W$4#~+aOo|uso_iTMsg40 z9W24bavvcEJiH7zplhJc;9z&)`(Hno+(}8ZlFQN?NHxu6n-$%zSSwE7a-i!HN9KMz z_9i-5x4t_KXru}>wW*ZUuE5ff;EK%i504vXj{)#M7ZA@)>e3&x00000NkvXXu0mjf DJDKP# literal 0 HcmV?d00001 diff --git a/app/templates/admin/list_items.html b/app/templates/admin/list_items.html index bd11ace..e5d648d 100644 --- a/app/templates/admin/list_items.html +++ b/app/templates/admin/list_items.html @@ -62,7 +62,7 @@ {{ service.description }} {{ service.price }} {{ service.period }} - {{ moment(service.date_last_charge).fromNow() }} + {{ moment(service.date_last_charge).format('lll') }} {{ service.owner.email }} {% endfor %} diff --git a/app/templates/admin/list_transactions.html b/app/templates/admin/list_transactions.html index 2d86ede..c51cf76 100644 --- a/app/templates/admin/list_transactions.html +++ b/app/templates/admin/list_transactions.html @@ -29,14 +29,14 @@ {{ transaction.description }} {{ transaction.value }} {{ transaction.currency }} - {{ transaction.date_created.strftime('%d %b %Y - %H:%m') }} + {{ moment(transaction.date_created).format('lll') }} {{ transaction.owner.email }} {% else %} {{ transaction.description }} {{ transaction.value }} {{ transaction.currency }} - {{ transaction.date_created.strftime('%d %b %Y - %H:%m') }} + {{ moment(transaction.date_created).format('lll') }} {{ transaction.owner.email }} {% endif %} diff --git a/app/templates/admin/list_users.html b/app/templates/admin/list_users.html index 6b95483..f49bca9 100644 --- a/app/templates/admin/list_users.html +++ b/app/templates/admin/list_users.html @@ -24,7 +24,7 @@ {{ usr.pid }} {{ usr.email }} - {{ moment(usr.last_seen).fromNow()}} + {{ moment(usr.last_seen).format('lll') }} {{ usr.last_ip }} {{ usr.wallet }} Dashboard diff --git a/app/templates/errors/403.html b/app/templates/errors/403.html index 0769eec..0b99580 100644 --- a/app/templates/errors/403.html +++ b/app/templates/errors/403.html @@ -6,11 +6,21 @@

Forbidden

+ 
-  ooo,    .---.
- o`  o   /    |\________________
-o`   'oooo()  | ________   _   _)
-`oo   o` \    |/        | | | |
-  `ooo'   `---'         "-" |_|                           
+     .-------.
+    / .-----. \
+   / /       \ \
+   | |       | |
+  _| |_______| |_
+.' |_|       |_| '.
+'._____ ___ _____.'
+|     .'___'.     |
+'.__.'.'   '.'.__.'
+'.__  | 403 |  __.'
+|   '.'.___.'.'   |
+'.____'.___.'____.'
+'._______________.'
+ {% endblock %} diff --git a/app/templates/errors/404.html b/app/templates/errors/404.html index e5c08e5..c0872c8 100644 --- a/app/templates/errors/404.html +++ b/app/templates/errors/404.html @@ -4,31 +4,29 @@ {% block page_content %}
-

Not Found

+

Page Not Found

- + 
-        \          SORRY            /
-         \                         /
-          \    This page does     /
-           ]   not exist yet.    [    ,'|
-           ]                     [   /  |
-           ]___               ___[ ,'   |
-           ]  ]\             /[  [ |:   |
-           ]  ] \           / [  [ |:   |
-           ]  ]  ]         [  [  [ |:   |
-           ]  ]  ]__     __[  [  [ |:   |
-           ]  ]  ] ]\ _ /[ [  [  [ |:   |
-           ]  ]  ] ] (#) [ [  [  [ :===='
-           ]  ]  ]_].nHn.[_[  [  [
-           ]  ]  ]  HHHHH. [  [  [
-           ]  ] /   `HH("N  \ [  [
-           ]__]/     HHH  "  \[__[
-           ]         NNN         [
-           ]         N/"         [
-           ]         N H         [
-          /          N            \
-         /           q,            \
-        /                           \
+                     %%%%
+                    %%%%-(
+                  _%%%%%_/                        \ ' /
+                _%%%%%%%%                        - (_) -
+              _%%%%%%%/ \%                        / , \
+             %%%%%%%%%\\ \_
+               %%%%%%   \ \\
+                   )    /\_/
+                 /(___. \
+                 '----' (
+                /       )
+    ---....____/        (_____ __ _ ___ ___ __ _ _ _____ _ _ ___
+              /         )---...___ =-= = -_= -=_= _-=_-_ -=- =-_
+            ,'          (         ```--.._= -_= -_= _-=- -_= _=-
+         ,-'            )                 ``--._=-_ =-=_-= _-= _
+         '-._    '-..___(                       ``-._=_-=_- =_-=
+             ``---....__)                            `-._-=_-_=-
+                   )|)|                                  `-._=-_
+        gnv       '-'-.\_                                    `-.
+ {% endblock %} diff --git a/app/templates/errors/500.html b/app/templates/errors/500.html index 3f9a273..b6299e4 100644 --- a/app/templates/errors/500.html +++ b/app/templates/errors/500.html @@ -6,6 +6,7 @@

Internal Server Error

+ 
         .--.       .--.
     _  `    \     /    `  _
@@ -22,5 +23,5 @@
        .'             `.
     _,'                 `,_
- + {% endblock %} diff --git a/app/templates/errors/csrf_error.html b/app/templates/errors/csrf_error.html index 6ad0624..9fa91b8 100644 --- a/app/templates/errors/csrf_error.html +++ b/app/templates/errors/csrf_error.html @@ -6,11 +6,17 @@

{{ reason }}

+ 
-  ooo,    .---.
- o`  o   /    |\________________
-o`   'oooo()  | ________   _   _)
-`oo   o` \    |/        | | | |
-  `ooo'   `---'         "-" |_|                           
+ ad8888888888ba
+dP'         `"8b,
+8  ,aaa,       "Y888a     ,aaaa,     ,aaa,  ,aa,
+8  8' `8           "8baaaad""""baaaad""""baad""8b
+8  8   8              """"      """"      ""    8b
+8  8, ,8         ,aaaaaaaaaaaaaaaaaaaaaaaaddddd88P
+8  `"""'       ,d8""
+Yb,         ,ad8"     nv
+ "Y8888888888P"
+ {% endblock %} diff --git a/app/templates/footer_colored.html b/app/templates/footer_colored.html index ef26376..e7daed7 100644 --- a/app/templates/footer_colored.html +++ b/app/templates/footer_colored.html @@ -1,6 +1,8 @@ diff --git a/app/templates/footer_index.html b/app/templates/footer_index.html index 592eb48..dd4ddd8 100644 --- a/app/templates/footer_index.html +++ b/app/templates/footer_index.html @@ -1,26 +1,20 @@ diff --git a/app/templates/footer_simple.html b/app/templates/footer_simple.html index 59256aa..50984b0 100644 --- a/app/templates/footer_simple.html +++ b/app/templates/footer_simple.html @@ -1,4 +1,4 @@
-

© Copyright 2015-2017 deflax.net, All Rights Reserved.

-

Design by _sys

+

© Copyright 2017 _sys, All Rights Reserved.

+

diff --git a/app/templates/nav.html b/app/templates/nav.html index 494535f..d18be09 100644 --- a/app/templates/nav.html +++ b/app/templates/nav.html @@ -20,7 +20,7 @@
    {% if not current_user.is_authenticated %} -
  • +359 32 398 295
    • +
  • +359 32 398 295
    • {% endif %} {% if current_user.is_authenticated %} diff --git a/app/templates/news/latest.html b/app/templates/news/latest.html index c448e2e..06ffb70 100644 --- a/app/templates/news/latest.html +++ b/app/templates/news/latest.html @@ -1,8 +1,7 @@ {% block page_content %} -

    News

    +

    News

    {% for item in result %} -

    {{ item['message'] }}

    - {{ item['created_time'] }} - {% endfor %}
    - >>> +

    {{ item['created_time'] }} + {{ item['message'] }}

    + {% endfor %} {% endblock %} diff --git a/app/templates/settings/acc_info.html b/app/templates/settings/acc_info.html index a4757c6..93cf568 100644 --- a/app/templates/settings/acc_info.html +++ b/app/templates/settings/acc_info.html @@ -2,7 +2,7 @@
    Details

    - Member Since: {{ moment(current_user.member_since).fromNow() }}
    + Member Since: {{ moment(current_user.member_since).local().fromNow() }}
    Group: {{ current_user.group }}
    2-Factor: {{ current_user.twofactor }}
    Change Password diff --git a/app/templates/uinvoice/transactions.html b/app/templates/uinvoice/transactions.html index ff09967..dcbdc71 100644 --- a/app/templates/uinvoice/transactions.html +++ b/app/templates/uinvoice/transactions.html @@ -10,7 +10,7 @@ var ctx = document.getElementById("transchart").getContext('2d'); var myChart = new Chart(ctx, { type: 'line', data: { - labels: ["Red", "Blue", "Yellow", "Green", "Purple", "Orange"], + labels: {{ labelslist }}, datasets: [{ label: "History", data: {{ translist }}, @@ -62,13 +62,13 @@ var myChart = new Chart(ctx, { {{ transaction.description }} {{ transaction.value }} {{ transaction.currency }} - {{ transaction.date_created.strftime('%d %b %Y - %H:%m') }} + {{ moment(transaction.date_created).format('lll') }} {% else %} {{ transaction.description }} {{ transaction.value }} {{ transaction.currency }} - {{ transaction.date_created.strftime('%d %b %Y - %H:%m') }} + {{ moment(transaction.date_created).format('lll') }} {% endif %} @@ -82,8 +82,6 @@ var myChart = new Chart(ctx, {

    - - {% endblock %} diff --git a/app/templates/vmanager/dashboard.html b/app/templates/vmanager/dashboard.html index 542275b..01e2c22 100644 --- a/app/templates/vmanager/dashboard.html +++ b/app/templates/vmanager/dashboard.html @@ -134,11 +134,11 @@ addEventListener("DOMContentLoaded", function() { {% for deploy in inv_deployments %} - {% if status[deploy.machine_id] == 'running' %}{% else %}{% endif %}{{ deploy.machine_alias }} - {{ deploy.machine_cpu }} Cores - {{ deploy.machine_mem }} MB - {{ deploy.machine_hdd }} GB - {% for addr in deploy.machine_addresses %}{{ addr.ip }}
    {% endfor %} + {% if status[deploy.machine_id] == 'running' %}{% else %}{% endif %}{{ deploy.machine_alias }} + {{ deploy.machine_cpu }} Cores + {{ deploy.machine_mem }} MB + {{ deploy.machine_hdd }} GB + {% for addr in deploy.machine_addresses %}{{ addr.ip }}
    {% endfor %} {% if status[deploy.machine_id] == 'running' %} @@ -169,7 +169,7 @@ addEventListener("DOMContentLoaded", function() { Category Description Price - Period (In Months) + Months Last Charged @@ -178,8 +178,8 @@ addEventListener("DOMContentLoaded", function() { {{ service.category }} {{ service.description }} {{ service.price }} - {{ service.period }} - {{ moment(service.date_last_charge).fromNow() }} + {{ service.period }} + {{ moment(service.date_last_charge).format('lll') }} ({{ moment(service.date_last_charge).fromNow() }}) {% endfor %}