aboutsummaryrefslogtreecommitdiffstats
path: root/view
diff options
context:
space:
mode:
Diffstat (limited to 'view')
-rw-r--r--view/css/conversation.css10
-rw-r--r--view/css/mod_mail.css100
-rw-r--r--view/js/mod_mail.js13
-rw-r--r--view/pdl/mod_blocks.pdl3
-rw-r--r--view/pdl/mod_chanview.pdl3
-rw-r--r--view/pdl/mod_connect.pdl3
-rw-r--r--view/pdl/mod_connections.pdl5
-rw-r--r--view/pdl/mod_connedit.pdl6
-rw-r--r--view/pdl/mod_directory.pdl7
-rw-r--r--view/pdl/mod_group.pdl3
-rw-r--r--view/pdl/mod_layouts.pdl3
-rw-r--r--view/pdl/mod_mail.pdl3
-rw-r--r--view/pdl/mod_menu.pdl3
-rw-r--r--view/pdl/mod_mitem.pdl4
-rw-r--r--view/pdl/mod_photos.pdl4
-rw-r--r--view/pdl/mod_search.pdl3
-rw-r--r--view/pdl/mod_suggest.pdl4
-rw-r--r--view/pdl/mod_webpages.pdl3
-rw-r--r--view/theme/redbasic/css/style.css14
-rw-r--r--view/theme/redbasic/js/redbasic.js12
-rwxr-xr-xview/tpl/abook_edit.tpl4
-rw-r--r--view/tpl/design_tools.tpl2
-rwxr-xr-xview/tpl/mail_conv.tpl4
-rwxr-xr-xview/tpl/mail_list.tpl2
-rwxr-xr-xview/tpl/prv_message.tpl2
-rwxr-xr-xview/tpl/siteinfo.tpl2
26 files changed, 198 insertions, 24 deletions
diff --git a/view/css/conversation.css b/view/css/conversation.css
index 5bf6a3607..8125b6278 100644
--- a/view/css/conversation.css
+++ b/view/css/conversation.css
@@ -110,7 +110,7 @@
/* conversation */
-.thread-wrapper .toplevel_item {
+.thread-wrapper.toplevel_item {
width: 92%;
}
@@ -125,6 +125,14 @@
position: relative;
}
+.wall-item-content-wrapper .wall-item-delete-wrapper {
+ opacity: 0;
+}
+
+.wall-item-content-wrapper:hover .wall-item-delete-wrapper {
+ opacity: 1;
+}
+
.wall-item-info {
display: block;
float: left;
diff --git a/view/css/mod_mail.css b/view/css/mod_mail.css
new file mode 100644
index 000000000..c278f4d53
--- /dev/null
+++ b/view/css/mod_mail.css
@@ -0,0 +1,100 @@
+/* message */
+
+#mail-list-wrapper {
+ border-top: 1px solid #ccc;
+ padding: 5px 5px 5px 5px;
+}
+
+span.mail-list {
+ float: left;
+ width: 20%;
+}
+
+img.mail-list-sender-photo {
+ height: 24px;
+ width: 24px;
+ float: left;
+ margin-right: 30px;
+}
+
+.mail-list-remove {
+ width: 5% !important;
+}
+
+/* message/new */
+
+#prvmail-to-label,
+#prvmail-subject-label,
+#prvmail-expires-label,
+#prvmail-message-label {
+ margin-bottom: 10px;
+ margin-top: 20px;
+}
+
+#prvmail-submit {
+ float: left;
+ margin-top: 10px;
+ margin-right: 30px;
+}
+
+#prvmail-upload-wrapper,
+#prvmail-attach-wrapper,
+#prvmail-link-wrapper,
+#prvmail-expire-wrapper,
+#prvmail-encrypt-wrapper,
+#prvmail-rotator-wrapper {
+ float: left;
+ margin-top: 10px;
+ margin-right: 10px;
+ width: 24px;
+ cursor: pointer;
+}
+
+#prvmail-end {
+ clear: both;
+}
+
+/* message/id */
+
+.mail-conv-outside-wrapper {
+ margin-top: 30px;
+}
+
+.mail-conv-sender,
+.mail-conv-detail {
+ float: left;
+}
+
+.mail-conv-detail {
+ margin-left: 20px;
+ width: 500px;
+}
+
+.mail-conv-subject {
+ font-size: 1.4em;
+ margin: 10px 0;
+}
+
+.mail-conv-delete-wrapper {
+ float: right;
+ margin-right: 30px;
+ margin-top: 15px;
+}
+
+.mail-conv-delete-icon {
+ border: none;
+}
+
+.mail-conv-recall-wrapper {
+ float: right;
+ margin-right: 10px;
+ margin-top: 15px;
+}
+
+.mail-conv-outside-wrapper-end {
+ clear: both;
+}
+
+.mail-conv-break {
+ clear: both;
+}
diff --git a/view/js/mod_mail.js b/view/js/mod_mail.js
new file mode 100644
index 000000000..82f60f46f
--- /dev/null
+++ b/view/js/mod_mail.js
@@ -0,0 +1,13 @@
+$(document).ready(function() {
+ var a;
+ a = $("#recip").autocomplete({
+ serviceUrl: baseurl + '/acl',
+ minChars: 2,
+ width: 250,
+ id: 'recip-ac',
+ onSelect: function(value,data) {
+ $("#recip-complete").val(data);
+ },
+ });
+
+});
diff --git a/view/pdl/mod_blocks.pdl b/view/pdl/mod_blocks.pdl
new file mode 100644
index 000000000..cef69f194
--- /dev/null
+++ b/view/pdl/mod_blocks.pdl
@@ -0,0 +1,3 @@
+[region=aside]
+[widget=design_tools][/widget]
+[/region] \ No newline at end of file
diff --git a/view/pdl/mod_chanview.pdl b/view/pdl/mod_chanview.pdl
new file mode 100644
index 000000000..d8f50ad7a
--- /dev/null
+++ b/view/pdl/mod_chanview.pdl
@@ -0,0 +1,3 @@
+[region=aside]
+[widget=vcard][/widget]
+[/region]
diff --git a/view/pdl/mod_connect.pdl b/view/pdl/mod_connect.pdl
new file mode 100644
index 000000000..6b1d2a15e
--- /dev/null
+++ b/view/pdl/mod_connect.pdl
@@ -0,0 +1,3 @@
+[region=aside]
+[widget=profile][/widget]
+[/region]
diff --git a/view/pdl/mod_connections.pdl b/view/pdl/mod_connections.pdl
new file mode 100644
index 000000000..fc86e4490
--- /dev/null
+++ b/view/pdl/mod_connections.pdl
@@ -0,0 +1,5 @@
+[region=aside]
+[widget=follow][/widget]
+[widget=suggestions][/widget]
+[widget=findpeople][/widget]
+[/region]
diff --git a/view/pdl/mod_connedit.pdl b/view/pdl/mod_connedit.pdl
new file mode 100644
index 000000000..4b468e34c
--- /dev/null
+++ b/view/pdl/mod_connedit.pdl
@@ -0,0 +1,6 @@
+[region=aside]
+[widget=vcard][/widget]
+[widget=collections][var=mode]abook[/var][/widget]
+[widget=suggestions][/widget]
+[widget=findpeople][/widget]
+[/region]
diff --git a/view/pdl/mod_directory.pdl b/view/pdl/mod_directory.pdl
new file mode 100644
index 000000000..0bc8ed936
--- /dev/null
+++ b/view/pdl/mod_directory.pdl
@@ -0,0 +1,7 @@
+[region=aside]
+[widget=findpeople][/widget]
+[widget=dirsafemode][/widget]
+[widget=dirsort][/widget]
+[widget=dirtags][/widget]
+[widget=suggestions][/widget]
+[/region]
diff --git a/view/pdl/mod_group.pdl b/view/pdl/mod_group.pdl
new file mode 100644
index 000000000..8db29cf78
--- /dev/null
+++ b/view/pdl/mod_group.pdl
@@ -0,0 +1,3 @@
+[region=aside]
+[widget=collections][var=mode]groups[/var][/widget]
+[/region]
diff --git a/view/pdl/mod_layouts.pdl b/view/pdl/mod_layouts.pdl
new file mode 100644
index 000000000..cef69f194
--- /dev/null
+++ b/view/pdl/mod_layouts.pdl
@@ -0,0 +1,3 @@
+[region=aside]
+[widget=design_tools][/widget]
+[/region] \ No newline at end of file
diff --git a/view/pdl/mod_mail.pdl b/view/pdl/mod_mail.pdl
new file mode 100644
index 000000000..d8f50ad7a
--- /dev/null
+++ b/view/pdl/mod_mail.pdl
@@ -0,0 +1,3 @@
+[region=aside]
+[widget=vcard][/widget]
+[/region]
diff --git a/view/pdl/mod_menu.pdl b/view/pdl/mod_menu.pdl
new file mode 100644
index 000000000..cef69f194
--- /dev/null
+++ b/view/pdl/mod_menu.pdl
@@ -0,0 +1,3 @@
+[region=aside]
+[widget=design_tools][/widget]
+[/region] \ No newline at end of file
diff --git a/view/pdl/mod_mitem.pdl b/view/pdl/mod_mitem.pdl
new file mode 100644
index 000000000..c210606d0
--- /dev/null
+++ b/view/pdl/mod_mitem.pdl
@@ -0,0 +1,4 @@
+[region=aside]
+[widget=design_tools][/widget]
+[widget=menu_preview][/widget]
+[/region] \ No newline at end of file
diff --git a/view/pdl/mod_photos.pdl b/view/pdl/mod_photos.pdl
new file mode 100644
index 000000000..c37cf02fe
--- /dev/null
+++ b/view/pdl/mod_photos.pdl
@@ -0,0 +1,4 @@
+[region=aside]
+[widget=vcard][/widget]
+[widget=photo_albums][/widget]
+[/region]
diff --git a/view/pdl/mod_search.pdl b/view/pdl/mod_search.pdl
new file mode 100644
index 000000000..7de4a270f
--- /dev/null
+++ b/view/pdl/mod_search.pdl
@@ -0,0 +1,3 @@
+[region=aside]
+[widget=savedsearch][/widget]
+[/region]
diff --git a/view/pdl/mod_suggest.pdl b/view/pdl/mod_suggest.pdl
new file mode 100644
index 000000000..c2889f2fe
--- /dev/null
+++ b/view/pdl/mod_suggest.pdl
@@ -0,0 +1,4 @@
+[region=aside]
+[widget=follow][/widget]
+[widget=findpeople][/widget]
+[/region] \ No newline at end of file
diff --git a/view/pdl/mod_webpages.pdl b/view/pdl/mod_webpages.pdl
new file mode 100644
index 000000000..cef69f194
--- /dev/null
+++ b/view/pdl/mod_webpages.pdl
@@ -0,0 +1,3 @@
+[region=aside]
+[widget=design_tools][/widget]
+[/region] \ No newline at end of file
diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css
index 9ac021a54..5f532a861 100644
--- a/view/theme/redbasic/css/style.css
+++ b/view/theme/redbasic/css/style.css
@@ -2087,12 +2087,12 @@ margin-right: 50px;
}
a .drop-icons {
- color: #777;
+ color: $toolicon_colour;;
font-size: 1.2em;
text-decoration: none;
}
-.drop-icons:hover {
+a .drop-icons:hover {
color: #FF0000;
}
@@ -2122,6 +2122,10 @@ a .drop-icons {
margin-right: 10px;
}
+.design-tools ul {
+ list-style-type: none;
+}
+
.design-icons {
margin-right: 10px;
}
@@ -2265,7 +2269,7 @@ img.mail-list-sender-photo {
border-left: 2px solid #eee;
}
-.thread-wrapper .toplevel_item {
+.thread-wrapper.toplevel_item {
max-width: $converse_width;
}
@@ -2364,10 +2368,6 @@ img.mail-list-sender-photo {
color: $toolicon_activecolour;
}
-.drop-icons.item-tool {
- color: $toolicon_colour;
-}
-
.like-rotator {
color: $toolicon_colour;
}
diff --git a/view/theme/redbasic/js/redbasic.js b/view/theme/redbasic/js/redbasic.js
index e89c51119..e41fde2b8 100644
--- a/view/theme/redbasic/js/redbasic.js
+++ b/view/theme/redbasic/js/redbasic.js
@@ -47,16 +47,6 @@ $('.savedsearchdrop').hover(
$(this).css('opacity','0');}
);
-$('.savedsearchterm').hover(
- function() {
- id = $(this).attr('id');
- $('#dropicon-' + id).css('opacity','1.0');},
-
- function() {
- id = $(this).attr('id');
- $('#dropicon-' + id).css('opacity','0');
- });
-
});
@@ -72,4 +62,4 @@ $(document).ready(function(){
}
};
setInterval(function () {checkNotify();}, 10 * 1000);
-}); \ No newline at end of file
+});
diff --git a/view/tpl/abook_edit.tpl b/view/tpl/abook_edit.tpl
index 23368f2f7..590213fd3 100755
--- a/view/tpl/abook_edit.tpl
+++ b/view/tpl/abook_edit.tpl
@@ -16,6 +16,10 @@
<div id="contact-edit-wrapper">
+{{if $last_update}}
+{{$lastupdtext}} {{$last_update}}
+{{/if}}
+
{{if $notself}}
{{if $slide}}
<h3>{{$lbl_slider}}</h3>
diff --git a/view/tpl/design_tools.tpl b/view/tpl/design_tools.tpl
index eb082dc37..80a538231 100644
--- a/view/tpl/design_tools.tpl
+++ b/view/tpl/design_tools.tpl
@@ -1,7 +1,9 @@
<div id="design-tools" class="widget design-tools">
<h3>{{$title}}</h3>
+<ul>
<li><a href="blocks/{{$who}}">{{$blocks}}</a></li>
<li><a href="menu">{{$menus}}</a></li>
<li><a href="layouts/{{$who}}">{{$layout}}</a></li>
<li><a href="webpages/{{$who}}">{{$pages}}</a></li>
+</ul>
</div>
diff --git a/view/tpl/mail_conv.tpl b/view/tpl/mail_conv.tpl
index 84bdb451a..f794ffc78 100755
--- a/view/tpl/mail_conv.tpl
+++ b/view/tpl/mail_conv.tpl
@@ -8,9 +8,9 @@
<div class="mail-conv-date">{{$mail.date}}</div>
<div class="mail-conv-subject">{{$mail.subject}}</div>
<div class="mail-conv-body">{{$mail.body}}</div>
- <div class="mail-conv-delete-wrapper" id="mail-conv-delete-wrapper-{{$mail.id}}" ><a href="message/drop/{{$mail.id}}" onclick="return confirmDelete();" title="{{$mail.delete}}" id="mail-conv-delete-icon-{{$mail.id}}" class="mail-conv-delete-icon" ><i class="icon-remove mail-icons drop-icons"></i></a></div><div class="mail-conv-delete-end"></div>
+ <div class="mail-conv-delete-wrapper" id="mail-conv-delete-wrapper-{{$mail.id}}" ><a href="mail/drop/{{$mail.id}}" onclick="return confirmDelete();" title="{{$mail.delete}}" id="mail-conv-delete-icon-{{$mail.id}}" class="mail-conv-delete-icon" ><i class="icon-remove mail-icons drop-icons"></i></a></div><div class="mail-conv-delete-end"></div>
{{if $mail.can_recall}}
- <div class="mail-conv-recall-wrapper" id="mail-conv-recall-wrapper-{{$mail.id}}" ><a href="message/recall/{{$mail.id}}" title="{{$mail.recall}}" id="mail-conv-recall-icon-{{$mail.id}}" class="mail-conv-recall-icon" ><i class="icon-undo mail-icons drop-icons"></i></a></div><div class="mail-conv-recall-end"></div>
+ <div class="mail-conv-recall-wrapper" id="mail-conv-recall-wrapper-{{$mail.id}}" ><a href="mail/recall/{{$mail.id}}" title="{{$mail.recall}}" id="mail-conv-recall-icon-{{$mail.id}}" class="mail-conv-recall-icon" ><i class="icon-undo mail-icons drop-icons"></i></a></div><div class="mail-conv-recall-end"></div>
{{/if}}
<div class="mail-conv-outside-wrapper-end"></div>
</div>
diff --git a/view/tpl/mail_list.tpl b/view/tpl/mail_list.tpl
index c96827996..e17a206a0 100755
--- a/view/tpl/mail_list.tpl
+++ b/view/tpl/mail_list.tpl
@@ -1,7 +1,7 @@
<div class="generic-content-wrapper" id="mail-list-wrapper">
<a href="{{$from_url}}" class ="mail-list" ><img class="mail-list-sender-photo" src="{{$from_photo}}" alt="{{$from_name}}" /></a>
<span class="mail-list">{{$from_name}}</span>
- <span class="mail-list {{if $seen}}seen{{else}}unseen{{/if}}"><a href="message/{{$id}}" class="mail-link">{{$subject}}</a></span>
+ <span class="mail-list {{if $seen}}seen{{else}}unseen{{/if}}"><a href="mail/{{$id}}" class="mail-link">{{$subject}}</a></span>
<span class="mail-list" title="{{$date}}">{{$date}}</span>
<span class="mail-list mail-list-remove"><a href="message/dropconv/{{$id}}" onclick="return confirmDelete();" title="{{$delete}}" ><i class="icon-remove mail-icons drop-icons"></i></a></span>
<div class="clear">&nbsp;</div>
diff --git a/view/tpl/prv_message.tpl b/view/tpl/prv_message.tpl
index b7654dc2d..3330a338f 100755
--- a/view/tpl/prv_message.tpl
+++ b/view/tpl/prv_message.tpl
@@ -1,7 +1,7 @@
<h3>{{$header}}</h3>
<div id="prvmail-wrapper" >
-<form id="prvmail-form" action="message" method="post" >
+<form id="prvmail-form" action="mail" method="post" >
{{$parent}}
diff --git a/view/tpl/siteinfo.tpl b/view/tpl/siteinfo.tpl
index f6647110c..a60b406cf 100755
--- a/view/tpl/siteinfo.tpl
+++ b/view/tpl/siteinfo.tpl
@@ -2,7 +2,7 @@
<p></p>
<p>{{$description}}</p>
{{if $version}}
-<p>{{$version}}</p>
+<p>{{$version}}{{if $commit}}+{{$commit}}{{/if}}</p>
{{/if}}
<p>{{$web_location}}</p>
<p>{{$visit}}</p>
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-11 22:36:07 +0000