From fa350a1170c94dbb33f9fe660190b5f881b7d98d Mon Sep 17 00:00:00 2001 From: mah1987 Date: Mon, 1 Jun 2015 20:28:06 +0200 Subject: [PATCH 01/38] adding privmsg base template based on uu-theme --- .../templates/portal/privmsg/base.html | 24 +++++++++++++++++++ 1 file changed, 24 insertions(+) create mode 100644 inyoka_theme_default/templates/portal/privmsg/base.html diff --git a/inyoka_theme_default/templates/portal/privmsg/base.html b/inyoka_theme_default/templates/portal/privmsg/base.html new file mode 100644 index 0000000..4dedf60 --- /dev/null +++ b/inyoka_theme_default/templates/portal/privmsg/base.html @@ -0,0 +1,24 @@ +{# + portal/privmsg/base.html + ~~~~~~~~~~~~~~~~~~~~~~~~~~~ + + :copyright: (c) 2007-2015 by the Inyoka Team, see AUTHORS for more details. + :license: BSD, see LICENSE for more details. +#} + +{% from 'macros.html' import breadcrumb_item, sidebar, sidebar_item %} +{%- extends 'portal/base.html' %} + +{% block breadcrumb %} + {{ super() }} +{% endblock %} + +{% block sidebar %} + {% call macros.sidebar(_('Messages')) %} + {{ macros.sidebar_item(_('Inbox'), href('portal', 'privmsg', 'inbox'), 'fa_icon-inbox') }} + {{ macros.sidebar_item(_('Sent Mail'), href('portal', 'privmsg', 'sent') , 'fa_icon-share-square') }} + {{ macros.sidebar_item(_('Archive'), href('portal', 'privmsg', 'archive'), 'fa_icon-archive') }} + {{ macros.sidebar_item(_('Trash'), href('portal', 'privmsg', 'trash'), 'fa_icon-trash') }} + {{ macros.sidebar_item(_('Compose message'), href('portal', 'privmsg', 'new'), 'fa_icon-envelope-square') }} + {% endcall %} +{% endblock %} From 1dc6b8313ec34b23d5214c03de476514e25a2eda Mon Sep 17 00:00:00 2001 From: mah1987 Date: Mon, 1 Jun 2015 20:28:21 +0200 Subject: [PATCH 02/38] adding privmsg index template based on uu-theme --- .../templates/portal/privmsg/index.html | 204 ++++++++++++++++++ 1 file changed, 204 insertions(+) create mode 100644 inyoka_theme_default/templates/portal/privmsg/index.html diff --git a/inyoka_theme_default/templates/portal/privmsg/index.html b/inyoka_theme_default/templates/portal/privmsg/index.html new file mode 100644 index 0000000..8de5e9e --- /dev/null +++ b/inyoka_theme_default/templates/portal/privmsg/index.html @@ -0,0 +1,204 @@ +{# + portal/privmsg/index.html + ~~~~~~~~~~~~~~~~~~~~~~~~~ + + Display a list of private messages. + + :copyright: (c) 2007-2015 by the Inyoka Team, see AUTHORS for more details. + :license: BSD, see LICENSE for more details. +#} + +{% import 'macros.html' as macros %} + +{% extends 'portal/privmsg/base.html' %} + +{% block breadcrumb %} + {{ macros.breadcrumb_item(_('Portal'), href('portal', 'privmsg', 'inbox')) }} +{% endblock %} + +{% block content %} + {%- if message %} +
+ {{ macros.add_user_avatar(message.author) }} +
+
{% trans %}From:{% endtrans %}
+
+ + {{- message.author|e }} + +
+
{% trans %}To:{% endtrans %}
+
+ {% for user in message.recipients -%} + {{ user|e }} + {%- if not loop.last %}, {% endif %} + {% else %} + … + {% endfor %} +
+
{% trans %}Subject:{% endtrans %}
+
{{ message.subject|e }}
+
{% trans %}Date:{% endtrans %}
+
{{ message.pub_date|datetime }}
+
+
+ {{ message.rendered_text }} +
+
+ {%- if not message.author == USER %} + + {% if message.author.is_active %} + {% trans %}Reply{% endtrans %} | + {%- endif %} + + {%- if message.recipients|length > 1 %} + {% trans %}Reply to all{% endtrans %} | + {%- endif %} + {%- endif %} + {% trans %}Forward{% endtrans %} | + {%- if folder.id == 'trash' %} + {% trans %}Restore{% endtrans %} | + {%- elif folder.id != 'archive' %} + {% trans %}Archive{% endtrans %} | + {%- endif %} + {% trans %}Delete message{% endtrans %} +
+
+ {%- trans moderators='http://wiki.ubuntuusers.de/ubuntuusers/Moderatoren' -%} + If you received a spam message, please forward it to a moderator. + {%- endtrans -%} +
+
+ {%- endif %} + +
+ {{ csrf_token() }} + + + + + + + + + + + + + + + + + + + + + {%- for entry in entries %} + + + + + + + + + {%- else %} + + + + {%- endfor %} + + + + + + +
{% trans %}Subject{% endtrans %}{% trans %}From{% endtrans %}{% trans %}To{% endtrans %}{% trans %}Date{% endtrans %}{% trans %}Actions{% endtrans %}{% trans %}Delete{% endtrans %}
+ {% if not entry.read %}{% endif -%} + {{ entry.message.subject|e|truncate(50,false,'...') }} + {%- if not entry.read %}{% endif %} + + + {{- entry.message.author|e -}} + + + {%- if entry.message.recipients|length == 0 %} + + {{- entry.message.author|e -}} + + {% else %} + + {{- entry.message.recipients[0]|e -}} + + {%- endif %} + {%- if entry.message.recipients|length > 1 %}, …{% endif %} + {{ entry.message.pub_date|datetime }} + {%- if not entry.is_own_message %} + {% if entry.message.author.is_active %} + + + + {%- endif -%} + {%- if entry.message.recipients|length > 1 %} + + + + {%- endif -%} + {%- endif %} + + + + {%- if not entry.in_archive %} + + + + {%- endif %} + + +
+ {% trans %}Currently there are no messages in this folder.{% endtrans %} +
+
+ {{ macros.render_pagination(pagination) }} +

+ {% if one_page %} + + {%- trans %}Split messages into multiple pages{% endtrans -%} + + {% else %} + + {%- trans %}Display all messages on one page{% endtrans -%} + + {% endif %} +

+
+

+ {% trans %}Compose message{% endtrans %} + +

+
+
+{% endblock %} + +{% block scripts %} +{{ super() }} + +{% endblock %} From 4d75741434570f4fefff2d19948b7e6374b091dd Mon Sep 17 00:00:00 2001 From: mah1987 Date: Mon, 1 Jun 2015 20:28:32 +0200 Subject: [PATCH 03/38] adding privmsg new-form template based on uu-theme --- .../templates/portal/privmsg/new.html | 73 +++++++++++++++++++ 1 file changed, 73 insertions(+) create mode 100644 inyoka_theme_default/templates/portal/privmsg/new.html diff --git a/inyoka_theme_default/templates/portal/privmsg/new.html b/inyoka_theme_default/templates/portal/privmsg/new.html new file mode 100644 index 0000000..67a0b64 --- /dev/null +++ b/inyoka_theme_default/templates/portal/privmsg/new.html @@ -0,0 +1,73 @@ +{# + portal/privmsg/index.html + ~~~~~~~~~~~~~~~~~~~~~~~~~ + + Display a list of private messages. + + :copyright: (c) 2007-2015 by the Inyoka Team, see AUTHORS for more details. + :license: BSD, see LICENSE for more details. +#} +{% import 'macros.html' as macros %} + +{% extends 'portal/privmsg/base.html' %} + + +{% block breadcrumb %} + {{ macros.breadcrumb_item(_('Portal'), href('portal', 'privmsg', 'inbox')) }} +{% endblock %} + +{% block content %} + {% call macros.outer_form(csrf_token(), form, action=href('portal', 'privmsg', 'new'), manually_rendered=True, submit_label=_('Send message')) %} + {% if USER.can('send_group_pm') %} + {{ macros.inner_form(form, ['recipient', 'group_recipient','subject', 'text']) }} + {% else %} + {{ macros.inner_form(form, ['recipient', 'subject', 'text']) }} + {% endif %} + + {% endcall %} + {%- if preview %} +
+

{% trans %}Preview{% endtrans %}

+
{{ preview }}
+
+ {%- endif %} +{% endblock %} + +{% block additional_scripts %} + {{ super() }} + +{% endblock %} From 651e9e49278b158b9607b8d0145d8ad87395a552 Mon Sep 17 00:00:00 2001 From: mah1987 Date: Mon, 1 Jun 2015 20:30:08 +0200 Subject: [PATCH 04/38] adding empty Template confirm_action_flash @todo: remove template-dependency in py-code --- inyoka_theme_default/templates/confirm_action_flash.html | 7 +++++++ 1 file changed, 7 insertions(+) create mode 100644 inyoka_theme_default/templates/confirm_action_flash.html diff --git a/inyoka_theme_default/templates/confirm_action_flash.html b/inyoka_theme_default/templates/confirm_action_flash.html new file mode 100644 index 0000000..51d5cf6 --- /dev/null +++ b/inyoka_theme_default/templates/confirm_action_flash.html @@ -0,0 +1,7 @@ +{# + confirm_action_flash.html + ~~~~~~~~~~~~~~~~~~~~~~~~~ + + :copyright: (c) 2011-2015 by the Inyoka Team, see AUTHORS for more details. + :license: BSD, see LICENSE for more details. +#} From d0b110ff9c1dd77d33a92ad5088da9c3b71da912 Mon Sep 17 00:00:00 2001 From: mah1987 Date: Mon, 1 Jun 2015 20:30:45 +0200 Subject: [PATCH 05/38] adding basic style for privmsg Table --- .../static/style/inyoka/portal.less | 30 ++++++++++++++++++- 1 file changed, 29 insertions(+), 1 deletion(-) diff --git a/inyoka_theme_default/static/style/inyoka/portal.less b/inyoka_theme_default/static/style/inyoka/portal.less index fc40727..8b8e1f6 100644 --- a/inyoka_theme_default/static/style/inyoka/portal.less +++ b/inyoka_theme_default/static/style/inyoka/portal.less @@ -54,9 +54,37 @@ } } } + &-usericon { font-size: 20ex; text-align: center; vertical-align: middle; } -} + + &-privmsg-table { + th.actions { + text-align: center; + } + .actions { + text-align: right; + } + th.delete { + text-align: center; + input { + margin-left: 5px; + } + } + .pn_delete { + text-align: center; + } + + @media (min-width: @screen-md-min) { + .actionscol {width:10%;} + .deletecol {width:14%;} + } + @media (min-width: @screen-lg-min) { + .actionscol {width:10%;} + .deletecol {width:12%;} + } + } +} \ No newline at end of file From 7ed1cf282a1d7a372c8d30b9454f5704d0a9f396 Mon Sep 17 00:00:00 2001 From: mah1987 Date: Mon, 1 Jun 2015 20:31:18 +0200 Subject: [PATCH 06/38] adding button-style for new button --- inyoka_theme_default/static/style/inyoka/inyoka.less | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/inyoka_theme_default/static/style/inyoka/inyoka.less b/inyoka_theme_default/static/style/inyoka/inyoka.less index 69acc73..cd0de41 100644 --- a/inyoka_theme_default/static/style/inyoka/inyoka.less +++ b/inyoka_theme_default/static/style/inyoka/inyoka.less @@ -201,7 +201,12 @@ html, body { } } -button, input[type="button"], input[type="submit"] { +a.button { + &:extend(.btn); + &:extend(.btn-primary); +} + +.button, button, input[type="button"], input[type="submit"] { &:extend(.btn); &:extend(.btn-primary); margin-top: 10px; From 5150cb4b055607492db9faa11e74010b5de9b793 Mon Sep 17 00:00:00 2001 From: MAH1987 Date: Mon, 8 Jun 2015 14:44:53 +0200 Subject: [PATCH 07/38] copy content from uu-theme for archive-message --- .../templates/confirm_action_flash.html | 10 ++++++++++ 1 file changed, 10 insertions(+) mode change 100644 => 100755 inyoka_theme_default/templates/confirm_action_flash.html diff --git a/inyoka_theme_default/templates/confirm_action_flash.html b/inyoka_theme_default/templates/confirm_action_flash.html old mode 100644 new mode 100755 index 51d5cf6..9dc527b --- a/inyoka_theme_default/templates/confirm_action_flash.html +++ b/inyoka_theme_default/templates/confirm_action_flash.html @@ -5,3 +5,13 @@ :copyright: (c) 2011-2015 by the Inyoka Team, see AUTHORS for more details. :license: BSD, see LICENSE for more details. #} +
+
+ {{ csrf_token() }} +

{{ message|e }}

+

+ + +

+
+
From 3542a581327df86c22d67e01aa07dd030aef04ef Mon Sep 17 00:00:00 2001 From: MAH1987 Date: Mon, 8 Jun 2015 14:51:01 +0200 Subject: [PATCH 08/38] adding responsivestyle for privmsg-table, adding messageblock --- .../static/style/inyoka/portal.less | 101 ++++++++++++++++++ .../templates/portal/privmsg/index.html | 83 +++++++------- 2 files changed, 145 insertions(+), 39 deletions(-) mode change 100644 => 100755 inyoka_theme_default/static/style/inyoka/portal.less mode change 100644 => 100755 inyoka_theme_default/templates/portal/privmsg/index.html diff --git a/inyoka_theme_default/static/style/inyoka/portal.less b/inyoka_theme_default/static/style/inyoka/portal.less old mode 100644 new mode 100755 index 8b8e1f6..9e9659d --- a/inyoka_theme_default/static/style/inyoka/portal.less +++ b/inyoka_theme_default/static/style/inyoka/portal.less @@ -86,5 +86,106 @@ .actionscol {width:10%;} .deletecol {width:12%;} } + + @media (max-width: @screen-xs-max) { + thead {display:none;} + tbody { + tr { + display:block; + width:100%; + height:auto; + border-top:1px solid @gray-lighter; + margin:15px 0 25px; + } + td { + display: block; + float:left; + width:50%; + border:0; + } + td:before { + display: inline-block; + width: auto; + padding-right: 10px; + white-space: nowrap; + content: attr(data-title)':'; + } + td.action, + td.pn_delete { + margin-bottom: 25px; + } + } + tfoot > tr { + > td { + border-top: none; + } + } + } + } + .message { + margin-bottom: 25px; + .head { + background: @gray-lighter; + padding:10px 8px; + border: 1px solid #ddd; + @media (max-width: @screen-xs-max) { + position: relative; + } + dl { + .dl-horizontal(); + margin-bottom: 0; + @media (max-width: @screen-xs-max) { + padding-right: 80px + } + dt { + text-align: left; + } + dd { + @media (min-width: @screen-sm-min) { + margin-left: 120px; + margin-bottom: 5px; + } + } + } + .avatar { + @media (max-width: @screen-xs-max) { + position: absolute; + right: 8px; + top: 10px; + } + text-align: center; + .fa_icon-user { + font-size:25px; + } + } + } + .body { + background: #fff; + padding: 15px 8px; + border-left: 1px solid #ddd; + border-right: 1px solid #ddd; + blockquote { + font-size: @font-size-base; + } + } + .foot{ + background: @gray-lighter; + border: 1px solid #ddd; + padding: 15px; + i { + @media (max-width: @screen-xs-max) { + font-size: 20px; + margin:0 8px; + } + } + span { + @media (max-width: @screen-xs-max) { + display: none; + } + } + } + .spam-info{ + padding: 0px 8px; + } } } \ No newline at end of file diff --git a/inyoka_theme_default/templates/portal/privmsg/index.html b/inyoka_theme_default/templates/portal/privmsg/index.html old mode 100644 new mode 100755 index 8de5e9e..23e60c1 --- a/inyoka_theme_default/templates/portal/privmsg/index.html +++ b/inyoka_theme_default/templates/portal/privmsg/index.html @@ -18,52 +18,57 @@ {% block content %} {%- if message %} -
- {{ macros.add_user_avatar(message.author) }} -
-
{% trans %}From:{% endtrans %}
-
- - {{- message.author|e }} - -
-
{% trans %}To:{% endtrans %}
-
- {% for user in message.recipients -%} - {{ user|e }} - {%- if not loop.last %}, {% endif %} - {% else %} - … - {% endfor %} -
-
{% trans %}Subject:{% endtrans %}
-
{{ message.subject|e }}
-
{% trans %}Date:{% endtrans %}
-
{{ message.pub_date|datetime }}
-
-
+
+
+
+
+
+
{% trans %}From:{% endtrans %}
+
+ + {{- message.author|e }} + +
+
{% trans %}To:{% endtrans %}
+
+ {% for user in message.recipients -%} + {{ user|e }} + {%- if not loop.last %}, {% endif %} + {% else %} + … + {% endfor %} +
+
{% trans %}Subject:{% endtrans %}
+
{{ message.subject|e }}
+
{% trans %}Date:{% endtrans %}
+
{{ message.pub_date|datetime }}
+
+
+
{{ macros.add_user_avatar(message.author) }}
+
+
+
{{ message.rendered_text }}
-
+
{%- if not message.author == USER %} - {% if message.author.is_active %} - {% trans %}Reply{% endtrans %} | + {% trans %}Reply{% endtrans %} | {%- endif %} {%- if message.recipients|length > 1 %} - {% trans %}Reply to all{% endtrans %} | + {% trans %}Reply to all{% endtrans %} | {%- endif %} {%- endif %} - {% trans %}Forward{% endtrans %} | + {% trans %}Forward{% endtrans %} | {%- if folder.id == 'trash' %} - {% trans %}Restore{% endtrans %} | + {% trans %}Restore{% endtrans %} | {%- elif folder.id != 'archive' %} - {% trans %}Archive{% endtrans %} | + {% trans %}Archive{% endtrans %} | {%- endif %} - {% trans %}Delete message{% endtrans %} + {% trans %}Delete message{% endtrans %}
-
+
{%- trans moderators='http://wiki.ubuntuusers.de/ubuntuusers/Moderatoren' -%} If you received a spam message, please forward it to a moderator. {%- endtrans -%} @@ -95,17 +100,17 @@ {%- for entry in entries %} - + {% if not entry.read %}{% endif -%} {{ entry.message.subject|e|truncate(50,false,'...') }} {%- if not entry.read %}{% endif %} - + {{- entry.message.author|e -}} - + {%- if entry.message.recipients|length == 0 %} {{- entry.message.author|e -}} @@ -117,8 +122,8 @@ {%- endif %} {%- if entry.message.recipients|length > 1 %}, …{% endif %} - {{ entry.message.pub_date|datetime }} - + {{ entry.message.pub_date|datetime }} + {%- if not entry.is_own_message %} {% if entry.message.author.is_active %} @@ -140,7 +145,7 @@ {%- endif %} - + From 8592feaad14ecf1e6a584326aa49c201f684c032 Mon Sep 17 00:00:00 2001 From: MAH1987 Date: Thu, 11 Jun 2015 20:55:44 +0200 Subject: [PATCH 09/38] change all the copyright-dates to 2013-2015 --- inyoka_theme_default/templates/confirm_action_flash.html | 2 +- inyoka_theme_default/templates/portal/privmsg/base.html | 2 +- inyoka_theme_default/templates/portal/privmsg/index.html | 2 +- inyoka_theme_default/templates/portal/privmsg/new.html | 4 ++-- 4 files changed, 5 insertions(+), 5 deletions(-) mode change 100644 => 100755 inyoka_theme_default/templates/portal/privmsg/base.html mode change 100644 => 100755 inyoka_theme_default/templates/portal/privmsg/new.html diff --git a/inyoka_theme_default/templates/confirm_action_flash.html b/inyoka_theme_default/templates/confirm_action_flash.html index 9dc527b..e844a30 100755 --- a/inyoka_theme_default/templates/confirm_action_flash.html +++ b/inyoka_theme_default/templates/confirm_action_flash.html @@ -2,7 +2,7 @@ confirm_action_flash.html ~~~~~~~~~~~~~~~~~~~~~~~~~ - :copyright: (c) 2011-2015 by the Inyoka Team, see AUTHORS for more details. + :copyright: (c) 2013-2015 by the Inyoka Team, see AUTHORS for more details. :license: BSD, see LICENSE for more details. #}
diff --git a/inyoka_theme_default/templates/portal/privmsg/base.html b/inyoka_theme_default/templates/portal/privmsg/base.html old mode 100644 new mode 100755 index 4dedf60..a50ef44 --- a/inyoka_theme_default/templates/portal/privmsg/base.html +++ b/inyoka_theme_default/templates/portal/privmsg/base.html @@ -2,7 +2,7 @@ portal/privmsg/base.html ~~~~~~~~~~~~~~~~~~~~~~~~~~~ - :copyright: (c) 2007-2015 by the Inyoka Team, see AUTHORS for more details. + :copyright: (c) 2013-2015 by the Inyoka Team, see AUTHORS for more details. :license: BSD, see LICENSE for more details. #} diff --git a/inyoka_theme_default/templates/portal/privmsg/index.html b/inyoka_theme_default/templates/portal/privmsg/index.html index 23e60c1..be68d47 100755 --- a/inyoka_theme_default/templates/portal/privmsg/index.html +++ b/inyoka_theme_default/templates/portal/privmsg/index.html @@ -4,7 +4,7 @@ Display a list of private messages. - :copyright: (c) 2007-2015 by the Inyoka Team, see AUTHORS for more details. + :copyright: (c) 2013-2015 by the Inyoka Team, see AUTHORS for more details. :license: BSD, see LICENSE for more details. #} diff --git a/inyoka_theme_default/templates/portal/privmsg/new.html b/inyoka_theme_default/templates/portal/privmsg/new.html old mode 100644 new mode 100755 index 67a0b64..4a21143 --- a/inyoka_theme_default/templates/portal/privmsg/new.html +++ b/inyoka_theme_default/templates/portal/privmsg/new.html @@ -4,8 +4,8 @@ Display a list of private messages. - :copyright: (c) 2007-2015 by the Inyoka Team, see AUTHORS for more details. - :license: BSD, see LICENSE for more details. + :copyright: (c) 2013-2015 by the Inyoka Team, see AUTHORS for more details. + :license: BSD, see LICENSE for more details. #} {% import 'macros.html' as macros %} From be03b9f0a9d247b5e57229421b2e70f4f1aaa5cf Mon Sep 17 00:00:00 2001 From: MAH1987 Date: Thu, 11 Jun 2015 21:18:48 +0200 Subject: [PATCH 10/38] fix and extend breadcrumb --- inyoka_theme_default/templates/portal/privmsg/base.html | 4 ++-- inyoka_theme_default/templates/portal/privmsg/index.html | 5 ++--- inyoka_theme_default/templates/portal/privmsg/new.html | 4 ++-- 3 files changed, 6 insertions(+), 7 deletions(-) diff --git a/inyoka_theme_default/templates/portal/privmsg/base.html b/inyoka_theme_default/templates/portal/privmsg/base.html index a50ef44..df24628 100755 --- a/inyoka_theme_default/templates/portal/privmsg/base.html +++ b/inyoka_theme_default/templates/portal/privmsg/base.html @@ -6,11 +6,11 @@ :license: BSD, see LICENSE for more details. #} -{% from 'macros.html' import breadcrumb_item, sidebar, sidebar_item %} -{%- extends 'portal/base.html' %} +{% extends 'portal/base.html' %} {% block breadcrumb %} {{ super() }} + {{ macros.breadcrumb_item(_('Messages'), href('portal', 'privmsg')) }} {% endblock %} {% block sidebar %} diff --git a/inyoka_theme_default/templates/portal/privmsg/index.html b/inyoka_theme_default/templates/portal/privmsg/index.html index be68d47..ab53697 100755 --- a/inyoka_theme_default/templates/portal/privmsg/index.html +++ b/inyoka_theme_default/templates/portal/privmsg/index.html @@ -8,12 +8,11 @@ :license: BSD, see LICENSE for more details. #} -{% import 'macros.html' as macros %} - {% extends 'portal/privmsg/base.html' %} {% block breadcrumb %} - {{ macros.breadcrumb_item(_('Portal'), href('portal', 'privmsg', 'inbox')) }} + {{ super() }} + {{ macros.breadcrumb_item(_(folder.name), href('portal', 'privmsg', folder.id)) }} {% endblock %} {% block content %} diff --git a/inyoka_theme_default/templates/portal/privmsg/new.html b/inyoka_theme_default/templates/portal/privmsg/new.html index 4a21143..2636e05 100755 --- a/inyoka_theme_default/templates/portal/privmsg/new.html +++ b/inyoka_theme_default/templates/portal/privmsg/new.html @@ -7,13 +7,13 @@ :copyright: (c) 2013-2015 by the Inyoka Team, see AUTHORS for more details. :license: BSD, see LICENSE for more details. #} -{% import 'macros.html' as macros %} {% extends 'portal/privmsg/base.html' %} {% block breadcrumb %} - {{ macros.breadcrumb_item(_('Portal'), href('portal', 'privmsg', 'inbox')) }} + {{ super() }} + {{ macros.breadcrumb_item(_('Compose message'), href('portal', 'privmsg', 'new')) }} {% endblock %} {% block content %} From d9968c5cba3f54c42fc11555db8fe8e1771a0d63 Mon Sep 17 00:00:00 2001 From: MAH1987 Date: Thu, 11 Jun 2015 21:26:48 +0200 Subject: [PATCH 11/38] remove link from act-page --- inyoka_theme_default/templates/portal/privmsg/index.html | 2 +- inyoka_theme_default/templates/portal/privmsg/new.html | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/inyoka_theme_default/templates/portal/privmsg/index.html b/inyoka_theme_default/templates/portal/privmsg/index.html index ab53697..c2a3f0e 100755 --- a/inyoka_theme_default/templates/portal/privmsg/index.html +++ b/inyoka_theme_default/templates/portal/privmsg/index.html @@ -12,7 +12,7 @@ {% block breadcrumb %} {{ super() }} - {{ macros.breadcrumb_item(_(folder.name), href('portal', 'privmsg', folder.id)) }} + {{ macros.breadcrumb_item(_(folder.name)) }} {% endblock %} {% block content %} diff --git a/inyoka_theme_default/templates/portal/privmsg/new.html b/inyoka_theme_default/templates/portal/privmsg/new.html index 2636e05..3107f41 100755 --- a/inyoka_theme_default/templates/portal/privmsg/new.html +++ b/inyoka_theme_default/templates/portal/privmsg/new.html @@ -13,7 +13,7 @@ {% block breadcrumb %} {{ super() }} - {{ macros.breadcrumb_item(_('Compose message'), href('portal', 'privmsg', 'new')) }} + {{ macros.breadcrumb_item(_('Compose message')) }} {% endblock %} {% block content %} From 72ccb840c325a9801699a1c55eb502d9cb68348f Mon Sep 17 00:00:00 2001 From: MAH1987 Date: Thu, 11 Jun 2015 21:28:27 +0200 Subject: [PATCH 12/38] =?UTF-8?q?fix=20additional=5Fscripts=20=E2=86=92=20?= =?UTF-8?q?scripts?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- inyoka_theme_default/templates/portal/privmsg/new.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/inyoka_theme_default/templates/portal/privmsg/new.html b/inyoka_theme_default/templates/portal/privmsg/new.html index 3107f41..ad2b979 100755 --- a/inyoka_theme_default/templates/portal/privmsg/new.html +++ b/inyoka_theme_default/templates/portal/privmsg/new.html @@ -33,7 +33,7 @@

{% trans %}Preview{% endtrans %}

{%- endif %} {% endblock %} -{% block additional_scripts %} +{% block scripts %} {{ super() }} + }) + /* ]]> */ + {% endblock %} diff --git a/inyoka_theme_default/templates/portal/privmsg/new.html b/inyoka_theme_default/templates/portal/privmsg/new.html index 764af3e..8e637d2 100755 --- a/inyoka_theme_default/templates/portal/privmsg/new.html +++ b/inyoka_theme_default/templates/portal/privmsg/new.html @@ -26,51 +26,34 @@ {% else %} {{ macros.inner_form(form, ['recipient', 'subject', 'text']) }} {% endif %} - + {% endcall %} - {% if preview %} -
-

{% trans %}Preview{% endtrans %}

-
{{ preview }}
-
- {% endif %} +
+

{% trans %}Preview{% endtrans %}

+
{{ preview }}
+
{% endblock %} {% block scripts %} {{ super() }} {% endblock %} From 5f2382841206435e9e60b5dfe20db890d535325d Mon Sep 17 00:00:00 2001 From: Lyra Date: Sun, 20 Sep 2015 22:19:21 +0200 Subject: [PATCH 29/38] Remove the possiblity to display all messages on a single page It only caused database troubles in the past, so i do not think, that it is needed to offer this function in the default layout. --- .../templates/portal/privmsg/index.html | 14 -------------- 1 file changed, 14 deletions(-) diff --git a/inyoka_theme_default/templates/portal/privmsg/index.html b/inyoka_theme_default/templates/portal/privmsg/index.html index 7190b33..82c0236 100755 --- a/inyoka_theme_default/templates/portal/privmsg/index.html +++ b/inyoka_theme_default/templates/portal/privmsg/index.html @@ -187,20 +187,6 @@ -
- {{ macros.render_pagination(pagination) }} -

- {% if one_page %} - - {% trans %}Split messages into multiple pages{% endtrans %} - - {% else %} - - {% trans %}Display all messages on one page{% endtrans %} - - {% endif %} -

-
{% trans %}Compose message{% endtrans %} From 378dcd29362c623459f6d6b545312fbdb1cb9e4a Mon Sep 17 00:00:00 2001 From: Lyra Date: Sun, 20 Sep 2015 22:22:16 +0200 Subject: [PATCH 30/38] Remove "Delete"-Label for the "Mark all" checkbox You only mark the messages there. If you click on the checkbox,it nothing will be deleted. So this label is wrong. --- inyoka_theme_default/templates/portal/privmsg/index.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/inyoka_theme_default/templates/portal/privmsg/index.html b/inyoka_theme_default/templates/portal/privmsg/index.html index 82c0236..e6fb395 100755 --- a/inyoka_theme_default/templates/portal/privmsg/index.html +++ b/inyoka_theme_default/templates/portal/privmsg/index.html @@ -121,7 +121,7 @@ {% trans %}To{% endtrans %} {% trans %}Date{% endtrans %} {% trans %}Actions{% endtrans %} - {% trans %}Delete{% endtrans %} + From 4ed5a57426e3b75dc3ae0192f794dca6c9d4ffab Mon Sep 17 00:00:00 2001 From: Lyra Date: Sun, 20 Sep 2015 22:23:28 +0200 Subject: [PATCH 31/38] Remove the footer of the table It doesn't make any sense to define a footer, if you use the max collspan. --- .../templates/portal/privmsg/index.html | 17 +++++++---------- 1 file changed, 7 insertions(+), 10 deletions(-) diff --git a/inyoka_theme_default/templates/portal/privmsg/index.html b/inyoka_theme_default/templates/portal/privmsg/index.html index e6fb395..78410ec 100755 --- a/inyoka_theme_default/templates/portal/privmsg/index.html +++ b/inyoka_theme_default/templates/portal/privmsg/index.html @@ -184,17 +184,14 @@ {% endfor %} - - - -
- {% trans %}Compose message{% endtrans %} - -
- - - + + {{ macros.render_pagination(pagination) }} + +
+ {% trans %}Compose message{% endtrans %} + +
{% endcall %} {% endblock %} From fd0a39b7abe6c06976f2a5f8ad882fecee0e6541 Mon Sep 17 00:00:00 2001 From: Lyra Date: Sun, 20 Sep 2015 22:33:43 +0200 Subject: [PATCH 32/38] Fix layouting with "strong" in template --- inyoka_theme_default/static/style/inyoka/portal.less | 7 +++++++ inyoka_theme_default/templates/portal/privmsg/index.html | 8 +++++--- 2 files changed, 12 insertions(+), 3 deletions(-) diff --git a/inyoka_theme_default/static/style/inyoka/portal.less b/inyoka_theme_default/static/style/inyoka/portal.less index 567edf7..7c3b8d6 100755 --- a/inyoka_theme_default/static/style/inyoka/portal.less +++ b/inyoka_theme_default/static/style/inyoka/portal.less @@ -34,6 +34,12 @@ vertical-align: middle; } + .private-message { + &-unread { + font-weight: bold; + } + } + &-privmsg-table { th.actions { text-align: center; @@ -95,6 +101,7 @@ } } } + .message { margin-bottom: 25px; .head { diff --git a/inyoka_theme_default/templates/portal/privmsg/index.html b/inyoka_theme_default/templates/portal/privmsg/index.html index 78410ec..65564a6 100755 --- a/inyoka_theme_default/templates/portal/privmsg/index.html +++ b/inyoka_theme_default/templates/portal/privmsg/index.html @@ -128,9 +128,11 @@ {% for entry in entries %} - {% if not entry.read %}{% endif %} - {{ entry.message.subject|e|truncate(50,false,'...') }} - {% if not entry.read %}{% endif %} + + {{ entry.message.subject|e|truncate(50)}} + From 4f6bab3695b4c507363e6e95963d9716053c71c6 Mon Sep 17 00:00:00 2001 From: Lyra Date: Sun, 20 Sep 2015 22:42:06 +0200 Subject: [PATCH 33/38] Remove unused classes --- .../templates/portal/privmsg/index.html | 22 ++++++------------- 1 file changed, 7 insertions(+), 15 deletions(-) diff --git a/inyoka_theme_default/templates/portal/privmsg/index.html b/inyoka_theme_default/templates/portal/privmsg/index.html index 65564a6..5201e5b 100755 --- a/inyoka_theme_default/templates/portal/privmsg/index.html +++ b/inyoka_theme_default/templates/portal/privmsg/index.html @@ -106,27 +106,19 @@ {% call macros.outer_form(csrf_token(), form, button_visible=False, manually_rendered=True) %} {{ csrf_token() }} - - - - - - - - - - - - - - + + + + + + {% for entry in entries %} - + - - {% else %} + {% else %}
{% trans %}Subject{% endtrans %}{% trans %}From{% endtrans %}{% trans %}To{% endtrans %}{% trans %}Date{% endtrans %}{% trans %}Actions{% endtrans %}{% trans %}Subject{% endtrans %}{% trans %}From{% endtrans %}{% trans %}To{% endtrans %}{% trans %}Date{% endtrans %}{% trans %}Actions{% endtrans %}
Date: Sun, 20 Sep 2015 22:46:40 +0200 Subject: [PATCH 34/38] Remove unnessary checks for inactive users Since it is planed to delete the messages in the feature after some time, it will a uncommon usecase to display messages from deleted users. Also the amount of checks is quite ugly inside the template. --- .../templates/portal/privmsg/index.html | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/inyoka_theme_default/templates/portal/privmsg/index.html b/inyoka_theme_default/templates/portal/privmsg/index.html index 5201e5b..228498e 100755 --- a/inyoka_theme_default/templates/portal/privmsg/index.html +++ b/inyoka_theme_default/templates/portal/privmsg/index.html @@ -127,18 +127,18 @@ - - {{ entry.message.author|e }} + + {{ entry.message.author|e }} {% if entry.message.recipients|length == 0 %} - - {{ entry.message.author|e }} + + {{ entry.message.author|e }} {% else %} - - {{ entry.message.recipients[0]|e }} + + {{ entry.message.recipients[0]|e }} {% endif %} {% if entry.message.recipients|length > 1 %}, …{% endif %} From f48bd8d6436ff224a926ae26f5275d8a05921895 Mon Sep 17 00:00:00 2001 From: Lyra Date: Sat, 14 Nov 2015 00:22:40 +0100 Subject: [PATCH 35/38] Fix minor errors in "index" --- inyoka_theme_default/templates/portal/privmsg/index.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/inyoka_theme_default/templates/portal/privmsg/index.html b/inyoka_theme_default/templates/portal/privmsg/index.html index 228498e..99c71ed 100755 --- a/inyoka_theme_default/templates/portal/privmsg/index.html +++ b/inyoka_theme_default/templates/portal/privmsg/index.html @@ -144,7 +144,7 @@ {% if entry.message.recipients|length > 1 %}, …{% endif %} {{ entry.message.pub_date|datetime }} + {% if not entry.is_own_message %} {% if entry.message.author.is_active %} @@ -170,7 +170,7 @@
{% trans %}Currently there are no messages in this folder.{% endtrans %} From 68a7f41bc8787958997550d8dfe91b2cd852ee1c Mon Sep 17 00:00:00 2001 From: Lyra Date: Sun, 17 Jan 2016 21:51:01 +0100 Subject: [PATCH 36/38] Minor improvments * Remove unneeded get_text() * Add missing space * Remove duplicated csrf-token --- inyoka_theme_default/templates/portal/privmsg/index.html | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/inyoka_theme_default/templates/portal/privmsg/index.html b/inyoka_theme_default/templates/portal/privmsg/index.html index 99c71ed..d25a0d1 100755 --- a/inyoka_theme_default/templates/portal/privmsg/index.html +++ b/inyoka_theme_default/templates/portal/privmsg/index.html @@ -11,7 +11,7 @@ {% extends 'portal/privmsg/base.html' %} {% block title %} - {{ _(folder.name) }} - {{ super() }} + {{ folder.name }} - {{ super() }} {% endblock %} {% block breadcrumb %} @@ -104,7 +104,6 @@ {% endif %} {% call macros.outer_form(csrf_token(), form, button_visible=False, manually_rendered=True) %} - {{ csrf_token() }} @@ -113,7 +112,7 @@ - + @@ -123,7 +122,7 @@ - {{ entry.message.subject|e|truncate(50)}} + {{ entry.message.subject|e|truncate(50) }}
{% trans %}To{% endtrans %} {% trans %}Date{% endtrans %} {% trans %}Actions{% endtrans %}
From e0bbfd046752a7aca35ed949691ad7dcfbfd16c6 Mon Sep 17 00:00:00 2001 From: Lyra Date: Sun, 17 Jan 2016 22:14:17 +0100 Subject: [PATCH 37/38] Simplify less * Use nesting * Remove unneeded and broken handling for smaller devices --- .../static/style/inyoka/portal.less | 60 ++++--------------- 1 file changed, 13 insertions(+), 47 deletions(-) diff --git a/inyoka_theme_default/static/style/inyoka/portal.less b/inyoka_theme_default/static/style/inyoka/portal.less index ad0a3c0..c379623 100755 --- a/inyoka_theme_default/static/style/inyoka/portal.less +++ b/inyoka_theme_default/static/style/inyoka/portal.less @@ -46,22 +46,6 @@ } &-privmsg-table { - th.actions { - text-align: center; - } - .actions { - text-align: right; - } - th.delete { - text-align: center; - input { - margin-left: 5px; - } - } - .pn_delete { - text-align: center; - } - @media (min-width: @screen-md-min) { .actionscol {width:10%;} .deletecol {width:14%;} @@ -70,41 +54,23 @@ .actionscol {width:10%;} .deletecol {width:12%;} } - - @media (max-width: @screen-xs-max) { - thead {display:none;} - tbody { - tr { - display:block; - width:100%; - height:auto; - border-top:1px solid @gray-lighter; - margin:15px 0 25px; - } - td { - display: block; - float:left; - width:50%; - border:0; - } - td:before { - display: inline-block; - width: auto; - padding-right: 10px; - white-space: nowrap; - content: attr(data-title)':'; - } - td.action, - td.pn_delete { - margin-bottom: 25px; + .actions { + text-align: right; + } + th { + &.delete { + text-align: center; + input { + margin-left: 5px; } } - tfoot > tr { - > td { - border-top: none; - } + &.actions { + text-align: center; } } + .pn_delete { + text-align: center; + } } .message { From 4701ac309540aae94ce8cfbcd233cae711cb0ab3 Mon Sep 17 00:00:00 2001 From: Lyra Date: Sun, 17 Jan 2016 22:58:17 +0100 Subject: [PATCH 38/38] Add correct rows to the header of a private message --- inyoka_theme_default/templates/portal/privmsg/index.html | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/inyoka_theme_default/templates/portal/privmsg/index.html b/inyoka_theme_default/templates/portal/privmsg/index.html index d25a0d1..5138355 100755 --- a/inyoka_theme_default/templates/portal/privmsg/index.html +++ b/inyoka_theme_default/templates/portal/privmsg/index.html @@ -34,6 +34,8 @@ {{ message.author|e }} + +
{% trans %}To:{% endtrans %}
@@ -43,12 +45,16 @@ {% if not loop.last %}, {% endif %} {% endfor %}
+ +
{% trans %}Subject:{% endtrans %}
{{ message.subject|e }}
+
+
{% trans %}Date:{% endtrans %}