aboutsummaryrefslogtreecommitdiffstats
path: root/view
diff options
context:
space:
mode:
Diffstat (limited to 'view')
-rw-r--r--view/css/mod_group.css75
-rw-r--r--view/theme/redbasic/css/style.css32
-rwxr-xr-xview/tpl/group_edit.tpl48
-rwxr-xr-xview/tpl/groupeditor.tpl26
-rw-r--r--view/tpl/micropro_card.tpl6
-rw-r--r--view/tpl/privacy_groups.tpl28
6 files changed, 91 insertions, 124 deletions
diff --git a/view/css/mod_group.css b/view/css/mod_group.css
index b828e551d..215064706 100644
--- a/view/css/mod_group.css
+++ b/view/css/mod_group.css
@@ -1,66 +1,19 @@
-
-#group-new-submit-wrapper {
- margin-top: 30px;
-}
-/*
-#group-edit-form > label {
- float: left;
- width: 300px;
-}
-
-#group-edit-form input {
- float: left;
- width: 175px;
-}
-
-#group-edit-form .field {
- clear: both;
-}
-*/
-#group-edit-submit-wrapper input {
- clear: both;
- width: 100px;
-}
-
-#group-edit-select-end {
- clear: both;
-}
-/*
-#group-edit-name-label {
- float: left;
- width: 175px;
- margin-top: 20px;
- margin-bottom: 20px;
+.mpall,
+.mpgroup {
+ line-height: 1.2;
+ overflow: hidden;
+ white-space: nowrap;
+ text-overflow: ellipsis;
}
-#group-edit-name {
- float: left;
- width: 225px;
- margin-top: 20px;
- margin-bottom: 20px;
+#groups-index th:nth-child(1),
+#groups-index td:nth-child(1){
+ white-space: nowrap;
+ padding: 7px 3px 7px 10px;
}
-#group-edit-name-wrapper {
-
-
-}
-*/
-
-#group_members_select_label {
- display: block;
- float: left;
- width: 175px;
-}
-
-.group_members_select {
- float: left;
- width: 230px;
- overflow: auto;
-}
-
-#group_members_select_end {
- clear: both;
-}
-#group-edit-name-end {
- clear: both;
+#groups-index th:nth-child(2),
+#groups-index td:nth-child(2){
+ text-align: center;
+ padding: 7px 10px 7px 7px;
}
diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css
index 87c97f1f5..6ffccb4e9 100644
--- a/view/theme/redbasic/css/style.css
+++ b/view/theme/redbasic/css/style.css
@@ -693,31 +693,6 @@ nav .acpopup {
margin-bottom: 15px;
}
-#group-members {
- margin-top: 20px;
- padding: 10px;
- height: 250px;
- overflow: auto;
- border: 1px solid #ddd;
-}
-
-#group-separator {
- margin-top: 10px;
- margin-bottom: 10px;
-}
-
-#group-all-contacts {
- padding: 10px;
- height: 450px;
- overflow: auto;
- border: 1px solid #ddd;
-}
-
-#group-edit-desc {
- margin-top: 15px;
-}
-
-
#prof-members {
margin-top: 20px;
padding: 10px;
@@ -830,7 +805,7 @@ div.jGrowl div.jGrowl-notification {
.dropdown-notification,
.notification,
.member-item {
- line-height: 1.1em;
+ line-height: 1.2em;
font-size: 0.75rem;
overflow: hidden;
text-overflow: ellipsis;
@@ -1177,6 +1152,7 @@ img.mail-conv-sender-photo {
.wall-item-ago,
.dropdown-sub-text {
color: #777;
+ display: block;
}
.wall-item-content,
@@ -1416,6 +1392,9 @@ main.fullscreen .generic-content-wrapper {
main.fullscreen .section-title-wrapper {
border-radius: 0px;
+ position: sticky;
+ top: 0;
+ z-index: 1020;
}
main.fullscreen .section-content-wrapper,
@@ -1429,6 +1408,7 @@ main.fullscreen .section-content-wrapper-np {
.atoken-index-row:hover td,
.chatroom-index-row:hover td,
+.group-index-row:hover td,
.wikis-index-row:hover td,
.locs-index-row:hover td,
[id^="cloud-index-"]:hover td,
diff --git a/view/tpl/group_edit.tpl b/view/tpl/group_edit.tpl
index d9412a6f7..88f037abe 100755
--- a/view/tpl/group_edit.tpl
+++ b/view/tpl/group_edit.tpl
@@ -1,26 +1,30 @@
-<div class="generic-content-wrapper-styled">
-<h2>{{$title}}</h2>
-
-
-<div id="group-edit-wrapper" >
- <form action="group/{{$gid}}" id="group-edit-form" method="post" >
- <input type='hidden' name='form_security_token' value='{{$form_security_token}}'>
-
- {{include file="field_input.tpl" field=$gname}}
- {{include file="field_checkbox.tpl" field=$public}}
- {{if $drop}}{{$drop}}{{/if}}
- <div id="group-edit-submit-wrapper" >
- <input type="submit" name="submit" value="{{$submit}}" >
+<div class="generic-content-wrapper">
+ <div class="section-title-wrapper">
+ <div class="float-right">
+ <button type="button" class="btn btn-sm btn-outline-secondary" onclick="openClose('group_tools')"><i class="fa fa-pencil"></i> {{$details_label}}</button>
+ <button id="fullscreen-btn" type="button" class="btn btn-outline-secondary btn-sm" onclick="makeFullScreen();"><i class="fa fa-expand"></i></button>
+ <button id="inline-btn" type="button" class="btn btn-outline-secondary btn-sm" onclick="makeFullScreen(false);"><i class="fa fa-compress"></i></button>
</div>
- <div id="group-edit-select-end" ></div>
- </form>
-</div>
-
+ <h2>{{$title}}</h2>
+ </div>
-{{if $groupeditor}}
- <div id="group-update-wrapper">
- {{include file="groupeditor.tpl"}}
+ <div id="group_tools" class="clearfix section-content-tools-wrapper" style="display: none">
+ <form action="group/{{$gid}}" id="group-edit-form" method="post" >
+ <input type='hidden' name='form_security_token' value='{{$form_security_token_edit}}'>
+ {{include file="field_input.tpl" field=$gname}}
+ {{include file="field_checkbox.tpl" field=$public}}
+ <a href="group/drop/{{$gid}}?t={{$form_security_token_drop}}" onclick="return confirmDelete();" class="btn btn-sm btn-danger">
+ {{$delete}}
+ </a>
+ <button type="submit" name="submit" class="btn btn-sm btn-primary float-right">{{$submit}}</button>
+ </form>
+ </div>
+ <div class="section-content-info-wrapper">
+ {{$desc}}
+ </div>
+ <div class="section-content-wrapper">
+ <div id="group-update-wrapper" class="clearfix">
+ {{include file="groupeditor.tpl"}}
+ </div>
</div>
-{{/if}}
-{{if $desc}}<div id="group-edit-desc">{{$desc}}</div>{{/if}}
</div>
diff --git a/view/tpl/groupeditor.tpl b/view/tpl/groupeditor.tpl
index c79bb0a2a..94c275c7e 100755
--- a/view/tpl/groupeditor.tpl
+++ b/view/tpl/groupeditor.tpl
@@ -1,16 +1,12 @@
-<div id="group">
-<h3>{{$groupeditor.label_members}}</h3>
-<div id="group-members" class="contact_list">
-{{foreach $groupeditor.members as $c}} {{$c}} {{/foreach}}
-</div>
-<div id="group-members-end"></div>
-<hr id="group-separator" />
-</div>
-
-<div id="contacts">
-<h3>{{$groupeditor.label_contacts}}</h3>
-<div id="group-all-contacts" class="contact_list">
-{{foreach $groupeditor.contacts as $m}} {{$m}} {{/foreach}}
-</div>
-<div id="group-all-contacts-end"></div>
+<div id="contacts" class="list-group float-left w-50 pr-2">
+ <h3>{{$groupeditor.label_contacts}}</h3>
+ <div id="group-all-contacts" class="contact_list">
+ {{foreach $groupeditor.contacts as $m}} {{$m}} {{/foreach}}
+ </div>
+</div>
+<div id="group" class="list-group float-right w-50">
+ <h3>{{$groupeditor.label_members}}</h3>
+ <div id="group-members" class="contact_list">
+ {{foreach $groupeditor.members as $c}} {{$c}} {{/foreach}}
+ </div>
</div>
diff --git a/view/tpl/micropro_card.tpl b/view/tpl/micropro_card.tpl
new file mode 100644
index 000000000..c1b621349
--- /dev/null
+++ b/view/tpl/micropro_card.tpl
@@ -0,0 +1,6 @@
+<a class="list-group-item{{if $class}} {{$class}}{{/if}} fakelink" href="{{if $click}}#{{else}}{{$url}}{{/if}}" {{if $click}}onclick="{{$click}}"{{/if}}>
+ <img class="menu-img-3" src="{{$photo}}" title="{{$title}}" alt="" />{{if $oneway}}<i class="fa fa-fw fa-minus-circle oneway-overlay text-danger"></i>{{/if}}
+ <span class="contactname">{{$name}}</span>
+ <span class="dropdown-sub-text">{{$addr}}</span>
+ <span class="dropdown-sub-text">{{$network}}</span>
+</a>
diff --git a/view/tpl/privacy_groups.tpl b/view/tpl/privacy_groups.tpl
new file mode 100644
index 000000000..b4e27ef2c
--- /dev/null
+++ b/view/tpl/privacy_groups.tpl
@@ -0,0 +1,28 @@
+<div class="generic-content-wrapper">
+ <div class="clearfix section-title-wrapper">
+ <button type="button" class="btn btn-sm btn-success float-right" onclick="openClose('group_tools')"><i class="fa fa-plus-circle"></i> {{$add_new_label}}</button>
+ <h2>{{$title}}</h2>
+ </div>
+ <div id="group_tools" class="clearfix section-content-tools-wrapper"{{if ! $new}} style="display: none"{{/if}}>
+ <form action="group/new" id="group-edit-form" method="post" >
+ <input type='hidden' name='form_security_token' value='{{$form_security_token}}'>
+ {{include file="field_input.tpl" field=$gname}}
+ {{include file="field_checkbox.tpl" field=$public}}
+ <button type="submit" name="submit" class="btn btn-sm btn-primary float-right">{{$submit}}</button>
+ </form>
+ </div>
+
+ <table id="groups-index">
+ <tr>
+ <th width="99%">{{$name_label}}</th>
+ <th width="1%">{{$count_label}}</th>
+ </tr>
+
+ {{foreach $entries as $group}}
+ <tr id="groups-index-{{$group.id}}" class="group-index-row">
+ <td><a href="group/{{$group.id}}">{{$group.name}}</a></td>
+ <td>{{$group.count}}</td>
+ </tr>
+ {{/foreach}}
+ </table>
+</div>