aboutsummaryrefslogtreecommitdiffstats
path: root/view
diff options
context:
space:
mode:
Diffstat (limited to 'view')
-rw-r--r--view/css/conversation.css5
-rw-r--r--view/css/mod_apps.css5
-rw-r--r--view/css/mod_mail.css31
-rw-r--r--view/css/widgets.css6
-rw-r--r--view/theme/redbasic/css/style.css9
-rw-r--r--view/tpl/app_create.tpl4
-rwxr-xr-xview/tpl/mail_conv.tpl53
-rwxr-xr-xview/tpl/myapps.tpl3
-rwxr-xr-xview/tpl/prv_message.tpl2
9 files changed, 40 insertions, 78 deletions
diff --git a/view/css/conversation.css b/view/css/conversation.css
index 289e389fa..27601b453 100644
--- a/view/css/conversation.css
+++ b/view/css/conversation.css
@@ -182,19 +182,20 @@ a.wall-item-name-link {
.comment-edit-text-empty,
.comment-edit-text-full {
padding: 0.5rem;
- line-height: 1.25;
width: 100%;
display: inherit;
}
.comment-edit-text-empty {
- height: 2.25rem;
+ height: 2rem;
+ line-height: 1;
overflow: hidden;
resize: none;
}
.comment-edit-text-full {
height: 7rem;
+ line-height: 1.25;
overflow: auto;
resize: vertical;
}
diff --git a/view/css/mod_apps.css b/view/css/mod_apps.css
index 0a231bc84..5e6000fb4 100644
--- a/view/css/mod_apps.css
+++ b/view/css/mod_apps.css
@@ -1,8 +1,7 @@
.app-container {
float: left;
- width: 150px;
- height: 180px;
- padding: 20px;
+ width: 148px;
+ margin: 20px;
}
.app-name {
diff --git a/view/css/mod_mail.css b/view/css/mod_mail.css
index 6a98267f0..8072b4668 100644
--- a/view/css/mod_mail.css
+++ b/view/css/mod_mail.css
@@ -1,34 +1,3 @@
-.mail-conv-sender {
- float: left;
- margin-right: 10px;
- margin-bottom: 10px;
-}
-
-.mail-conv-sender img{
- width: 2.2rem;
- height: 2.2rem;
-}
-
-.mail-conv-sender-name {
- font-weight: bold;
-}
-
-.mail-conv-body {
- margin-bottom: 10px;
-}
-
.mail-conv-body img {
max-width: 100%;
}
-
-#prvmail-rotator {
- margin: 15px;
-}
-
-#prvmail-text {
- height: 15.0em;
-}
-
-.mail-conv-outside-wrapper {
- margin-bottom: 20px;
-}
diff --git a/view/css/widgets.css b/view/css/widgets.css
index 622c1cb86..880745ba2 100644
--- a/view/css/widgets.css
+++ b/view/css/widgets.css
@@ -155,3 +155,9 @@ li:hover .group-edit-icon {
a.wikilist {
z-index: 1;
}
+
+/* mail list */
+
+.active .conv-participants {
+ color: #fff;
+}
diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css
index 692baa263..3265f1c44 100644
--- a/view/theme/redbasic/css/style.css
+++ b/view/theme/redbasic/css/style.css
@@ -737,10 +737,6 @@ div.jGrowl div.jGrowl-notification {
color: $font_colour;
}
-.active .conv-participants {
- color: #fff;
-}
-
.contactname {
font-weight: bold;
display: block;
@@ -1097,9 +1093,10 @@ a:hover .dropdown-sub-text {
}
.active .wall-item-ago,
-a:active .wall-item-ago,
+a.active:hover .wall-item-ago,
.active .dropdown-sub-text,
-a:active .dropdown-sub-text {
+a:active .dropdown-sub-text,
+a.active:hover .dropdown-sub-text {
color: #fff;
}
diff --git a/view/tpl/app_create.tpl b/view/tpl/app_create.tpl
index 7a0521436..5075ce5e2 100644
--- a/view/tpl/app_create.tpl
+++ b/view/tpl/app_create.tpl
@@ -3,7 +3,7 @@
<h2>{{$banner}}</h2>
</div>
- <div class="section-content-wrapper">
+ <div class="clearfix section-content-wrapper">
<form action="appman" method="post">
{{if $guid}}
<input type="hidden" name="guid" value="{{$guid}}" />
@@ -33,7 +33,7 @@
{{include file="field_textarea.tpl" field=$embed}}
{{/if}}
- <input type="submit" name="submit" value="{{$submit}}" />
+ <button class="btn btn-primary float-right" type="submit" name="submit" value="{{$submit}}">{{$submit}}</button>
</form>
</div>
diff --git a/view/tpl/mail_conv.tpl b/view/tpl/mail_conv.tpl
index ad13ba96d..759517b7f 100755
--- a/view/tpl/mail_conv.tpl
+++ b/view/tpl/mail_conv.tpl
@@ -1,47 +1,38 @@
-<div id="mail-{{$mail.id}}" class="mail-conv-outside-wrapper">
- <div class="mail-conv-sender" >
- <a href="{{$mail.from_url}}"><img class="mail-conv-sender-photo" src="{{$mail.from_photo}}" alt="{{$mail.from_name}}" /></a>
- </div>
- <div class="mail-conv-detail">
- {{if $mail.is_recalled}}<strong>{{$mail.is_recalled}}</strong>{{/if}}
- <div class="mail-conv-sender-name"><a href="{{$mail.from_url}}">{{$mail.from_name}}</a></div>
- <div class="mail-conv-date autotime wall-item-ago" title="{{$mail.date}}">{{$mail.date}}</div>
+<div id="mail-{{$mail.id}}" class="mb-2 clearfix mail-conv-outside-wrapper">
+ <div class="mb-2 clearfix wall-item-head">
+ <div class="wall-item-info" >
+ <a href="{{$mail.from_url}}"><img class="wall-item-photo" src="{{$mail.from_photo}}" alt="{{$mail.from_name}}" /></a>
+ </div>
+ <div class="mail-conv-detail">
+ {{if $mail.is_recalled}}<strong>{{$mail.is_recalled}}</strong>{{/if}}
+ <div class="wall-item-name"><a class="wall-item-name-link" href="{{$mail.from_url}}">{{$mail.from_name}}</a></div>
+ <div class="autotime wall-item-ago" title="{{$mail.date}}">{{$mail.date}}</div>
+ </div>
</div>
- <div class="clear"></div>
- <div class="mail-conv-content">
- <div class="mail-conv-body">
+ <div class="clearfix mail-conv-content">
+ <div class="clearfix mail-conv-body">
{{$mail.body}}
- <div class="clear"></div>
</div>
{{if $mail.attachments}}
- <div class="dropdown pull-left">
- <button type="button" class="btn btn-outline-secondary btn-sm wall-item-like dropdown-toggle" data-toggle="dropdown" id="attachment-menu-{{$item.id}}"><i class="fa fa-paperclip"></i></button>
- <ul class="dropdown-menu" role="menu" aria-labelledby="attachment-menu-{{$item.id}}">{{$mail.attachments}}</ul>
+ <div class="dropdown float-left">
+ <button type="button" class="btn btn-outline-secondary btn-sm wall-item-like dropdown-toggle" data-toggle="dropdown" id="attachment-menu-{{$item.id}}"><i class="fa fa-fw fa-paperclip"></i></button>
+ <div class="dropdown-menu" role="menu" aria-labelledby="attachment-menu-{{$item.id}}">{{$mail.attachments}}</div>
</div>
{{/if}}
- <div class="pull-right dropdown">
+ <div class="float-right dropdown">
<button type="button" class="btn btn-outline-secondary btn-sm dropdown-toggle" data-toggle="dropdown" id="mail-item-menu-{{$mail.id}}">
<i class="fa fa-cog"></i>
</button>
- <ul class="dropdown-menu" role="menu" aria-labelledby="mail-item-menu-{{$mail.id}}">
+ <div class="dropdown-menu dropdown-menu-right" role="menu" aria-labelledby="mail-item-menu-{{$mail.id}}">
{{if $mail.can_recall}}
- <li>
- <a href="mail/{{$mail.mailbox}}/recall/{{$mail.id}}" title="{{$mail.recall}}" id="mail-conv-recall-icon-{{$mail.id}}"><i class="fa fa-undo mail-icons"></i>&nbsp;{{$mail.recall}}</a>
- </li>
+ <a class="dropdown-item" href="mail/{{$mail.mailbox}}/recall/{{$mail.id}}" title="{{$mail.recall}}" id="mail-conv-recall-icon-{{$mail.id}}"><i class="fa fa-fw fa-undo"></i>&nbsp;{{$mail.recall}}</a>
{{/if}}
- <li>
- <a href="#" onclick="dropItem('mail/{{$mail.mailbox}}/drop/{{$mail.id}}', '#mail-{{$mail.id}}'); return false;" title="{{$mail.delete}}" id="mail-conv-delete-icon-{{$mail.id}}"><i class="fa fa-trash-o mail-icons"></i>&nbsp;{{$mail.delete}}</a>
- </li>
+ <a class="dropdown-item" href="#" onclick="dropItem('mail/{{$mail.mailbox}}/drop/{{$mail.id}}', '#mail-{{$mail.id}}'); return false;" title="{{$mail.delete}}" id="mail-conv-delete-icon-{{$mail.id}}"><i class="fa fa-fw fa-trash-o"></i>&nbsp;{{$mail.delete}}</a>
{{if $mail.can_recall}}
- <li class="divider"></li>
- <li>
- <a href="dreport/mail/{{$mail.mid}}" title="{{$mail.dreport}}" id="mail-conv-dreport-icon-{{$mail.id}}">{{$mail.dreport}}</a>
- </li>
+ <div class="dropdown-divider"></div>
+ <a class="dropdown-item" href="dreport/mail/{{$mail.mid}}" title="{{$mail.dreport}}" id="mail-conv-dreport-icon-{{$mail.id}}">{{$mail.dreport}}</a>
{{/if}}
- </ul>
-
+ </div>
</div>
- <div class="clear"></div>
</div>
- <div class="clear"></div>
</div>
diff --git a/view/tpl/myapps.tpl b/view/tpl/myapps.tpl
index b9f59b9c3..ccefa4a49 100755
--- a/view/tpl/myapps.tpl
+++ b/view/tpl/myapps.tpl
@@ -9,10 +9,9 @@
{{/if}}
<h2>{{$title}}{{if $cat}} - {{$cat}}{{/if}}</h2>
</div>
- <div class="section-content-wrapper">
+ <div class="clearfix section-content-wrapper">
{{foreach $apps as $ap}}
{{$ap}}
{{/foreach}}
- <div class="clear"></div>
</div>
</div>
diff --git a/view/tpl/prv_message.tpl b/view/tpl/prv_message.tpl
index 20b8ac209..925447ff2 100755
--- a/view/tpl/prv_message.tpl
+++ b/view/tpl/prv_message.tpl
@@ -28,7 +28,7 @@
{{/if}}
<div class="form-group">
<label for="prvmail-text">{{$yourmessage}}</label>
- <textarea class="form-control" id="prvmail-text" name="body">{{$text}}</textarea>
+ <textarea class="form-control" id="prvmail-text" name="body"{{if $new}} style="height: 10em;"{{/if}}>{{$text}}</textarea>
</div>
<div id="prvmail-submit-wrapper" class="form-group">
<div id="prvmail-submit" class="float-right btn-group">