-
Notifications
You must be signed in to change notification settings - Fork 12
Private Message implementation #108
Changes from all commits
fa350a1
1dc6b83
4d75741
651e9e4
d0b110f
7ed1cf2
5150cb4
3542a58
d5a5488
8592fea
be03b9f
d9968c5
72ccb84
1debb61
2909ddd
1f1889a
81595a6
b4f118d
bfcd3c7
a174885
6d1aa3d
ef9dd1b
762dd9e
5a050bf
1d0d9ab
117b1e8
0790ede
7293a26
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -54,9 +54,129 @@ | |
| } | ||
| } | ||
| } | ||
|
|
||
| &-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%;} | ||
| } | ||
|
|
||
| @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; | ||
|
Member
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. atm the rendering of the header is somehow not perfect (see screenshot). Is the i would also suggest to use the panel-classes for footer and header; see the article-mixin that is used for ikhaya- or planet-articles. (otherwise this could cause some rendering-issues, too) |
||
| padding:10px 8px; | ||
| border: 1px solid #ddd; | ||
| @media (max-width: @screen-xs-max) { | ||
| position: relative; | ||
| } | ||
| .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; | ||
| ul { | ||
| &:extend(.list-inline); | ||
| li { | ||
| &:extend(.list-inline > li); | ||
| border-right: 1px solid @gray-light; | ||
|
Member
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. personally i would not apply a border as it looks kind of "cleaner"/modern without it.
Member
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. i agree to you an will remove it in next push. |
||
| &:last-child { | ||
| border-right:none; | ||
| } | ||
| } | ||
| } | ||
| span[class^='fa_icon'] { | ||
| @media (max-width: @screen-xs-max) { | ||
| font-size: 20px; | ||
| margin:0 8px; | ||
| } | ||
| } | ||
| .text { | ||
|
Member
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. does the icon alone contain enough information what the link does – even if you have not seen the description on a bigger screen before? |
||
| @media (max-width: @screen-xs-max) { | ||
| display: none; | ||
| } | ||
| } | ||
| } | ||
| } | ||
| } | ||
|
Member
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. this one is not needed too. result of the merge-conflict ;) |
||
| 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 %} |
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,24 @@ | ||
| {# | ||
| 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 breadcrumb %} | ||
|
Member
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. well, if you insert nothing here into the breadcrumb block, you can remove it imho.
Member
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. check |
||
| {{ 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 %} | ||

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.
this seems to cause unwanted vertical lines on mobile devices