Skip to content
This repository was archived by the owner on May 19, 2021. It is now read-only.
Closed
Show file tree
Hide file tree
Changes from 8 commits
Commits
Show all changes
28 commits
Select commit Hold shift + click to select a range
fa350a1
adding privmsg base template based on uu-theme
MAH1987 Jun 1, 2015
1dc6b83
adding privmsg index template based on uu-theme
MAH1987 Jun 1, 2015
4d75741
adding privmsg new-form template based on uu-theme
MAH1987 Jun 1, 2015
651e9e4
adding empty Template confirm_action_flash
MAH1987 Jun 1, 2015
d0b110f
adding basic style for privmsg Table
MAH1987 Jun 1, 2015
7ed1cf2
adding button-style for new button
MAH1987 Jun 1, 2015
5150cb4
copy content from uu-theme for archive-message
MAH1987 Jun 8, 2015
3542a58
adding responsivestyle for privmsg-table, adding messageblock
MAH1987 Jun 8, 2015
d5a5488
Merge branch 'staging' of github.com:inyokaproject/theme-default into…
MAH1987 Jun 11, 2015
8592fea
change all the copyright-dates to 2013-2015
MAH1987 Jun 11, 2015
be03b9f
fix and extend breadcrumb
MAH1987 Jun 11, 2015
d9968c5
remove link from act-page
MAH1987 Jun 11, 2015
72ccb84
fix additional_scripts → scripts
MAH1987 Jun 11, 2015
1debb61
paste better destription for new message form
MAH1987 Jun 11, 2015
2909ddd
replace <i> with <span> for fa-icons
MAH1987 Jun 11, 2015
1f1889a
add a new line before and after div.body
MAH1987 Jun 11, 2015
81595a6
remove spam-infoblock
MAH1987 Jun 11, 2015
b4f118d
remove sidebar headline
MAH1987 Jun 11, 2015
bfcd3c7
remove jinja trim_blocks
MAH1987 Jun 11, 2015
a174885
replace form with macro-form
MAH1987 Jun 11, 2015
6d1aa3d
change seperator-code to unsortedlist with style
MAH1987 Jul 1, 2015
ef9dd1b
change linklist from p to div for better handling
MAH1987 Jul 1, 2015
762dd9e
remove else for recipients-forloop because its unused
MAH1987 Jul 1, 2015
5a050bf
replace definitionlist with bootstrap-cols
MAH1987 Jul 1, 2015
1d0d9ab
merge conflict for cherry-pick
Lyra2108 May 24, 2015
117b1e8
hide default button for delete-form
MAH1987 Aug 11, 2015
0790ede
fix less-compile bug, forgot to remove all definitionlist-style
MAH1987 Aug 11, 2015
7293a26
remove needless outer-div for confirmation-message
MAH1987 Sep 1, 2015
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 6 additions & 1 deletion inyoka_theme_default/static/style/inyoka/inyoka.less
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
131 changes: 130 additions & 1 deletion inyoka_theme_default/static/style/inyoka/portal.less
100644 → 100755
Original file line number Diff line number Diff line change
Expand Up @@ -54,9 +54,138 @@
}
}
}

&-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;
Copy link
Member

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

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;
Copy link
Member

Choose a reason for hiding this comment

The 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 .row at the right place?
bug_header_private_message

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;
}
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;
}
}
}
17 changes: 17 additions & 0 deletions inyoka_theme_default/templates/confirm_action_flash.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
{#
confirm_action_flash.html
~~~~~~~~~~~~~~~~~~~~~~~~~

:copyright: (c) 2011-2015 by the Inyoka Team, see AUTHORS for more details.
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please change all the copyright-dates to 2013-2015. (→ does not only affect this file)

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

check

:license: BSD, see LICENSE for more details.
#}
<div>
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

afaik it its impossible to extend inside this one. However, macros for the form could be used. So if you want to use them, try it. ;)

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

check

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this outer div is not needed imho as the form will be included in a div.message-info

<form action="{{ action_url|e }}" method="post">
{{ csrf_token() }}
<p>{{ message|e }}</p>
<p>
<input type="submit" name="confirm" value="{{ confirm_label|e }}" />
<input type="submit" name="cancel" value="{{ cancel_label|e }}" />
</p>
</form>
</div>
24 changes: 24 additions & 0 deletions inyoka_theme_default/templates/portal/privmsg/base.html
Original file line number Diff line number Diff line change
@@ -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 %}
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

these imports should not be needed, if you use macros.* inside the blocks everywhere.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

check

{%- extends 'portal/base.html' %}

{% block breadcrumb %}
Copy link
Member

Choose a reason for hiding this comment

The 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.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

check

{{ super() }}
{% endblock %}

{% block sidebar %}
{% call macros.sidebar(_('Messages')) %}
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I would remove 'Messages' from the sidebar and instead append something to the breadcrumb (as mentioned)

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

check

{{ 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 %}
Loading