This repository was archived by the owner on May 19, 2021. It is now read-only.
-
Notifications
You must be signed in to change notification settings - Fork 12
Fixes #90 Private message #137
Open
Lyra2108
wants to merge
41
commits into
inyokaproject:staging
Choose a base branch
from
Lyra2108:private-message
base: staging
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from all commits
Commits
Show all changes
41 commits
Select commit
Hold shift + click to select a range
fa350a1
adding privmsg base template based on uu-theme
MAH1987 1dc6b83
adding privmsg index template based on uu-theme
MAH1987 4d75741
adding privmsg new-form template based on uu-theme
MAH1987 651e9e4
adding empty Template confirm_action_flash
MAH1987 d0b110f
adding basic style for privmsg Table
MAH1987 7ed1cf2
adding button-style for new button
MAH1987 5150cb4
copy content from uu-theme for archive-message
MAH1987 3542a58
adding responsivestyle for privmsg-table, adding messageblock
MAH1987 d5a5488
Merge branch 'staging' of github.com:inyokaproject/theme-default into…
MAH1987 8592fea
change all the copyright-dates to 2013-2015
MAH1987 be03b9f
fix and extend breadcrumb
MAH1987 d9968c5
remove link from act-page
MAH1987 72ccb84
fix additional_scripts → scripts
MAH1987 1debb61
paste better destription for new message form
MAH1987 2909ddd
replace <i> with <span> for fa-icons
MAH1987 1f1889a
add a new line before and after div.body
MAH1987 81595a6
remove spam-infoblock
MAH1987 b4f118d
remove sidebar headline
MAH1987 bfcd3c7
remove jinja trim_blocks
MAH1987 a174885
replace form with macro-form
MAH1987 6d1aa3d
change seperator-code to unsortedlist with style
MAH1987 ef9dd1b
change linklist from p to div for better handling
MAH1987 762dd9e
remove else for recipients-forloop because its unused
MAH1987 5a050bf
replace definitionlist with bootstrap-cols
MAH1987 4e933f3
hide default button for delete-form
MAH1987 e92beaf
fix less-compile bug, forgot to remove all definitionlist-style
MAH1987 1336ff3
remove needless outer-div for confirmation-message
MAH1987 326343f
Merge remote-tracking branch 'upstream/staging' into private-message
Lyra2108 e9a7ab9
Add specific title settings to the private messages
Lyra2108 4f9e6c5
Fix java script
Lyra2108 5f23828
Remove the possiblity to display all messages on a single page
Lyra2108 378dcd2
Remove "Delete"-Label for the "Mark all" checkbox
Lyra2108 4ed5a57
Remove the footer of the table
Lyra2108 fd0a39b
Fix layouting with "strong" in template
Lyra2108 4f6bab3
Remove unused classes
Lyra2108 4e98d45
Remove unnessary checks for inactive users
Lyra2108 f48bd8d
Fix minor errors in "index"
Lyra2108 2986cac
Merge branch 'upstream/staging' into private-message
Lyra2108 68a7f41
Minor improvments
Lyra2108 e0bbfd0
Simplify less
Lyra2108 4701ac3
Add correct rows to the header of a private message
Lyra2108 File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,13 @@ | ||
| {# | ||
| confirm_action_flash.html | ||
| ~~~~~~~~~~~~~~~~~~~~~~~~~ | ||
|
|
||
| :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 %} | ||
|
|
||
| {% call macros.outer_form(csrf_token(), form, action=action_url|e, manually_rendered=True, submit_label=confirm_label|e) %} | ||
| <p>{{ message|e }}</p> | ||
| <input type="submit" name="cancel" value="{{ cancel_label|e }}" /> | ||
| {% endcall %} |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,28 @@ | ||
| {# | ||
| portal/privmsg/base.html | ||
| ~~~~~~~~~~~~~~~~~~~~~~~~~~~ | ||
|
|
||
| :copyright: (c) 2013-2015 by the Inyoka Team, see AUTHORS for more details. | ||
| :license: BSD, see LICENSE for more details. | ||
| #} | ||
|
|
||
| {% extends 'portal/base.html' %} | ||
|
|
||
| {% block title %} | ||
| {{ _('Messages') }} - {{ super() }} | ||
| {% endblock %} | ||
|
|
||
| {% block breadcrumb %} | ||
| {{ super() }} | ||
| {{ macros.breadcrumb_item(_('Messages'), href('portal', 'privmsg')) }} | ||
| {% endblock %} | ||
|
|
||
| {% block sidebar %} | ||
| {% call macros.sidebar() %} | ||
| {{ 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 %} |
211 changes: 211 additions & 0 deletions
211
inyoka_theme_default/templates/portal/privmsg/index.html
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,211 @@ | ||
| {# | ||
| portal/privmsg/index.html | ||
| ~~~~~~~~~~~~~~~~~~~~~~~~~ | ||
|
|
||
| Display a list of private messages. | ||
|
|
||
| :copyright: (c) 2013-2015 by the Inyoka Team, see AUTHORS for more details. | ||
| :license: BSD, see LICENSE for more details. | ||
| #} | ||
|
|
||
| {% extends 'portal/privmsg/base.html' %} | ||
|
|
||
| {% block title %} | ||
| {{ folder.name }} - {{ super() }} | ||
| {% endblock %} | ||
|
|
||
| {% block breadcrumb %} | ||
| {{ super() }} | ||
| {{ macros.breadcrumb_item(_(folder.name)) }} | ||
| {% endblock %} | ||
|
|
||
| {% block content %} | ||
| {% if message %} | ||
| <div class="message"> | ||
| <div class="head"> | ||
| <div class="row"> | ||
| <div class="col-sm-9"> | ||
| <div class="row"> | ||
| <div class="col-sm-3"> | ||
| <strong>{% trans %}From:{% endtrans %}</strong> | ||
| </div> | ||
| <div class="col-sm-9"> | ||
| <a{% if not message.author.is_active %} class="user_inactive"{% endif %} href="{{ message.author|url }}"> | ||
| {{ message.author|e }} | ||
| </a> | ||
| </div> | ||
| </div> | ||
| <div class="row"> | ||
| <div class="col-sm-3"> | ||
| <strong>{% trans %}To:{% endtrans %}</strong> | ||
| </div> | ||
| <div class="col-sm-9"> | ||
| {% for user in message.recipients %} | ||
| <a{% if not user.is_active %} class="user_inactive"{% endif %} href="{{ user|url }}">{{ user|e }}</a> | ||
| {% if not loop.last %}, {% endif %} | ||
| {% endfor %} | ||
| </div> | ||
| </div> | ||
| <div class="row"> | ||
| <div class="col-sm-3"> | ||
| <strong>{% trans %}Subject:{% endtrans %}</strong> | ||
| </div> | ||
| <div class="col-sm-9"> | ||
| {{ message.subject|e }} | ||
| </div> | ||
| </div> | ||
| <div class="row"> | ||
| <div class="col-sm-3"> | ||
| <strong>{% trans %}Date:{% endtrans %}</strong> | ||
| </div> | ||
| <div class="col-sm-9"> | ||
| {{ message.pub_date|datetime }} | ||
| </div> | ||
| </div> | ||
| </div> | ||
| <div class="col-sm-3 avatar">{{ macros.add_user_avatar(message.author) }}</div> | ||
| </div> | ||
| </div> | ||
|
|
||
| <div class="body"> | ||
| {{ message.rendered_text }} | ||
| </div> | ||
|
|
||
| <div class="foot"> | ||
| <ul> | ||
| {% if not message.author == USER %} | ||
| {% if message.author.is_active %} | ||
| <li><a class="pn_reply" href="{{ message|url('reply') }}"> | ||
| <span class="fa_icon-reply"></span> <span class="text">{% trans %}Reply{% endtrans %}</span> | ||
| </a></li> | ||
| {% endif %} | ||
|
|
||
| {% if message.recipients|length > 1 %} | ||
| <li><a class="pn_reply_all" href="{{ message|url('reply_to_all') }}"> | ||
| <span class="fa_icon-reply-all"></span> <span class="text">{% trans %}Reply to all{% endtrans %}</span> | ||
| </a></li> | ||
| {% endif %} | ||
| {% endif %} | ||
|
|
||
| <li><a class="pn_forward" href="{{ message|url('forward') }}"> | ||
| <span class="fa_icon-share"></span> <span class="text">{% trans %}Forward{% endtrans %}</span> | ||
| </a></li> | ||
|
|
||
| {% if folder.id == 'trash' %} | ||
| <li><a class="pn_restore" href="?action=restore"> | ||
| <span class="fa_icon-arrow-up"></span> <span class="text">{% trans %}Restore{% endtrans %}</span> | ||
| </a></li> | ||
| {% elif folder.id != 'archive' %} | ||
| <li><a class="pn_archive" href="?action=archive"> | ||
| <span class="fa_icon-archive"></span> <span class="text">{% trans %}Archive{% endtrans %}</span> | ||
| </a></li> | ||
| {% endif %} | ||
|
|
||
| <li><a class="pn_delete" href="?action=delete"> | ||
| <span class="fa_icon-trash-o"></span> <span class="text">{% trans %}Delete message{% endtrans %}</span> | ||
| </a></li> | ||
| </ul> | ||
| </div> | ||
| </div> | ||
| {% endif %} | ||
|
|
||
| {% call macros.outer_form(csrf_token(), form, button_visible=False, manually_rendered=True) %} | ||
| <table class="portal-privmsg-table portal-privmsg-responsive-table table table-striped"> | ||
| <thead> | ||
| <tr> | ||
| <th>{% trans %}Subject{% endtrans %}</th> | ||
| <th>{% trans %}From{% endtrans %}</th> | ||
| <th>{% trans %}To{% endtrans %}</th> | ||
| <th>{% trans %}Date{% endtrans %}</th> | ||
| <th>{% trans %}Actions{% endtrans %}</th> | ||
| <th><input id="private_message_mark_all" type="checkbox" ></th> | ||
| </tr> | ||
| </thead> | ||
| <tbody> | ||
| {% for entry in entries %} | ||
| <tr> | ||
| <td data-title="{% trans %}Subject{% endtrans %}"> | ||
| <a href="{{ entry|url }}" | ||
| {% if not entry.read %}class="private-message-unread"{% endif %} | ||
| > | ||
| {{ entry.message.subject|e|truncate(50) }} | ||
| </a> | ||
| </td> | ||
| <td data-title="{% trans %}From{% endtrans %}"> | ||
| <a href="{{ entry.message.author|url }}"> | ||
| {{ entry.message.author|e }} | ||
| </a> | ||
| </td> | ||
| <td data-title="{% trans %}To{% endtrans %}"> | ||
| {% if entry.message.recipients|length == 0 %} | ||
| <a href="{{ entry.message.author|url }}"> | ||
| {{ entry.message.author|e }} | ||
| </a> | ||
| {% else %} | ||
| <a href="{{ entry.message.recipients[0]|url }}"> | ||
| {{ entry.message.recipients[0]|e }} | ||
| </a> | ||
| {% endif %} | ||
| {% if entry.message.recipients|length > 1 %}, …{% endif %} | ||
| </td> | ||
| <td data-title="{% trans %}Date{% endtrans %}">{{ entry.message.pub_date|datetime }}</td> | ||
| <td data-title="{% trans %}Actions{% endtrans %}" class="actions"> | ||
| {% if not entry.is_own_message %} | ||
| {% if entry.message.author.is_active %} | ||
| <a href="{{ entry|url('reply') }}" title="{% trans %}Reply{% endtrans %}"> | ||
| <span class="fa_icon-reply"></span> | ||
| </a> | ||
| {% endif %} | ||
| {% if entry.message.recipients|length > 1 %} | ||
| <a href="{{ entry|url('reply_to_all') }}" title="{% trans %}Reply to all{% endtrans %}"> | ||
| <span class="fa_icon-reply-all"></span> | ||
| </a> | ||
| {% endif %} | ||
| {% endif %} | ||
| <a href="{{ entry|url('forward') }}" title="{% trans %}Forward{% endtrans %}"> | ||
| <span class="fa_icon-share"></span> | ||
| </a> | ||
| {% if not entry.in_archive %} | ||
| <a href="{{ entry|url }}?action=archive" title="{% trans %}Archive{% endtrans %}"> | ||
| <span class="fa_icon-archive"></span> | ||
| </a> | ||
| {% endif %} | ||
| </td> | ||
| <td data-title="{% trans %}Delete{% endtrans %}" class="pn_delete"> | ||
| <input type="checkbox" name="delete" value="{{ entry.id }}" /> | ||
| </td> | ||
| </tr> | ||
| {% else %} | ||
| <tr> | ||
| <td colspan="6"> | ||
| {% trans %}Currently there are no messages in this folder.{% endtrans %} | ||
| </td> | ||
| </tr> | ||
| {% endfor %} | ||
| </tbody> | ||
| </table> | ||
|
|
||
| {{ macros.render_pagination(pagination) }} | ||
|
|
||
| <div class="linklist"> | ||
| <a href="{{ href('portal', 'privmsg', 'new') }}" class="button">{% trans %}Compose message{% endtrans %}</a> | ||
| <input type="submit" value="{% trans %}Delete marked messages{% endtrans %}" class="button-delete" /> | ||
| </div> | ||
| {% endcall %} | ||
| {% endblock %} | ||
|
|
||
| {% block scripts %} | ||
| {{ super() }} | ||
| <script type="text/javascript"> | ||
| /* <![CDATA[ */ | ||
| $(function () { | ||
| $('#private_message_mark_all').click(function() { | ||
| all_checked = this.checked; | ||
| $('input[name="delete"]').each(function() { | ||
| this.checked = all_checked; | ||
| }); | ||
| }); | ||
| }) | ||
| /* ]]> */ | ||
| </script> | ||
| {% endblock %} | ||
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
should be with redis
.text_rendered– just as reminder ;)There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
still unchanged?