aboutsummaryrefslogtreecommitdiffstats
path: root/view
diff options
context:
space:
mode:
Diffstat (limited to 'view')
-rw-r--r--view/admin_users.tpl6
-rw-r--r--view/atom_suggest.tpl11
-rw-r--r--view/contact_edit.tpl1
-rw-r--r--view/contact_head.tpl2
-rw-r--r--view/crophead.tpl10
-rw-r--r--view/default.php1
-rw-r--r--view/event_head.tpl2
-rw-r--r--view/field_richtext.tpl44
-rw-r--r--view/intros.tpl2
-rw-r--r--view/jot-header.tpl2
-rw-r--r--view/msg-header.tpl2
-rw-r--r--view/profed_head.tpl2
-rw-r--r--view/suggestions.tpl20
-rw-r--r--view/theme/darkzero/style.css2
-rw-r--r--view/theme/dispy/jot-header.tpl20
-rw-r--r--view/theme/dispy/style.css9
-rw-r--r--view/theme/duepuntozero/style.css121
-rw-r--r--view/theme/loozah/style.css93
-rw-r--r--view/wall_item.tpl1
-rw-r--r--view/wallwall_item.tpl1
20 files changed, 277 insertions, 75 deletions
diff --git a/view/admin_users.tpl b/view/admin_users.tpl
index 952a8992b..bde7edb59 100644
--- a/view/admin_users.tpl
+++ b/view/admin_users.tpl
@@ -31,7 +31,7 @@
<td class="created">$u.created</td>
<td class="name">$u.name</td>
<td class="email">$u.email</td>
- <td class="checkbox"><input type="checkbox" class="pending_ckbx" id="id_pending_$u.hash" name="pending_$u.hash"/></td>
+ <td class="checkbox"><input type="checkbox" class="pending_ckbx" id="id_pending_$u.hash" name="pending[]" value="$u.hash" /></td>
<td class="tools">
<a href="$baseurl/regmod/allow/$u.hash" title='$approve'><span class='icon like'></span></a>
<a href="$baseurl/regmod/deny/$u.hash" title='$deny'><span class='icon dislike'></span></a>
@@ -70,10 +70,10 @@
<td class='login_date'>$u.login_date</td>
<td class='lastitem_date'>$u.lastitem_date</td>
<td class='login_date'>$u.page-flags</td>
- <td class="checkbox"><input type="checkbox" class="users_ckbx" id="id_user_$u.uid" name="user_$u.uid"/></td>
+ <td class="checkbox"><input type="checkbox" class="users_ckbx" id="id_user_$u.uid" name="user[]" value="$u.uid"/></td>
<td class="tools">
<a href="$baseurl/admin/users/block/$u.uid" title='{{ if $u.blocked }}$unblock{{ else }}$block{{ endif }}'><span class='icon block {{ if $u.blocked==0 }}dim{{ endif }}'></span></a>
- <a href="$baseurl/admin/users/delete/$u.uid" title='$discard' onclick="return confirm_delete('$u.name')"><span class='icon drop'></span></a>
+ <a href="$baseurl/admin/users/delete/$u.uid" title='$delete' onclick="return confirm_delete('$u.name')"><span class='icon drop'></span></a>
</td>
</tr>
{{ endfor }}
diff --git a/view/atom_suggest.tpl b/view/atom_suggest.tpl
new file mode 100644
index 000000000..66c61f9b6
--- /dev/null
+++ b/view/atom_suggest.tpl
@@ -0,0 +1,11 @@
+
+<dfrn:suggest>
+
+ <dfrn:url>$url</dfrn:url>
+ <dfrn:name>$name</dfrn:name>
+ <dfrn:photo>$photo</dfrn:photo>
+ <dfrn:request>$request</dfrn:request>
+ <dfrn:note>$note</dfrn:note>
+
+</dfrn:suggest>
+
diff --git a/view/contact_edit.tpl b/view/contact_edit.tpl
index 3246e4470..66479210f 100644
--- a/view/contact_edit.tpl
+++ b/view/contact_edit.tpl
@@ -45,6 +45,7 @@ $ignored
$grps
<div id="view-recent-wrapper"><a href="network/?cid=$contact_id" id="contact-view-recent">$lblrecent</a></div>
+$lblsuggest
<div id="contact-edit-info-wrapper">
<h4>$lbl_info1</h4>
diff --git a/view/contact_head.tpl b/view/contact_head.tpl
index 6a80c2122..c7de390af 100644
--- a/view/contact_head.tpl
+++ b/view/contact_head.tpl
@@ -1,5 +1,5 @@
<script language="javascript" type="text/javascript"
- src="$baseurl/tinymce/jscripts/tiny_mce/tiny_mce_src.js"></script>
+ src="$baseurl/library/tinymce/jscripts/tiny_mce/tiny_mce_src.js"></script>
<script language="javascript" type="text/javascript">
diff --git a/view/crophead.tpl b/view/crophead.tpl
index 2bfb7abe0..48f375426 100644
--- a/view/crophead.tpl
+++ b/view/crophead.tpl
@@ -1,6 +1,4 @@
- <script type="text/javascript" src="cropper/lib/prototype.js" language="javascript"></script>
-
- <script type="text/javascript" src="cropper/lib/scriptaculous.js?load=effects,builder,dragdrop" language="javascript"></script>
-
- <script type="text/javascript" src="cropper/cropper.js" language="javascript"></script>
- <link rel="stylesheet" href="cropper/cropper.css" type="text/css" />
+ <script type="text/javascript" src="library/cropper/lib/prototype.js" language="javascript"></script>
+ <script type="text/javascript" src="library/cropper/lib/scriptaculous.js?load=effects,builder,dragdrop" language="javascript"></script>
+ <script type="text/javascript" src="library/cropper/cropper.js" language="javascript"></script>
+ <link rel="stylesheet" href="library/cropper/cropper.css" type="text/css" />
diff --git a/view/default.php b/view/default.php
index 60bda2669..0d4a69054 100644
--- a/view/default.php
+++ b/view/default.php
@@ -2,6 +2,7 @@
<html>
<head>
<title><?php if(x($page,'title')) echo $page['title'] ?></title>
+ <script>var baseurl="<?php echo $a->get_baseurl() ?>";</script>
<?php if(x($page,'htmlhead')) echo $page['htmlhead'] ?>
</head>
<body>
diff --git a/view/event_head.tpl b/view/event_head.tpl
index 4e5063131..fe0b8fe2a 100644
--- a/view/event_head.tpl
+++ b/view/event_head.tpl
@@ -1,5 +1,5 @@
<script language="javascript" type="text/javascript"
- src="$baseurl/tinymce/jscripts/tiny_mce/tiny_mce_src.js"></script>
+ src="$baseurl/library/tinymce/jscripts/tiny_mce/tiny_mce_src.js"></script>
<script language="javascript" type="text/javascript">
diff --git a/view/field_richtext.tpl b/view/field_richtext.tpl
new file mode 100644
index 000000000..a5a453d32
--- /dev/null
+++ b/view/field_richtext.tpl
@@ -0,0 +1,44 @@
+
+ <div class='field richtext'>
+ <label for='id_$field.0'>$field.1</label>
+ <textarea name='$field.0' id='id_$field.0' class="fieldRichtext">$field.2</textarea>
+ <span class='field_help'>$field.3</span>
+ <script>
+ console.log(typeof tinyMCE);
+ if(typeof tinyMCE == "undefined") {
+ tinyMCE="loading";
+ window.tinyMCEPreInit = {
+ suffix:"",
+ base: baseurl+"/library/tinymce/jscripts/tiny_mce/",
+ query:"",
+ };
+ $(function(){
+ $.getScript(baseurl +"/library/tinymce/jscripts/tiny_mce/tiny_mce_src.js", function(){
+ tinyMCE.init({
+ theme : "advanced",
+ mode : "specific_textareas",
+ editor_selector: "fieldRichtext",
+ plugins : "bbcode,paste",
+ theme_advanced_buttons1 : "bold,italic,underline,undo,redo,link,unlink,image,forecolor,formatselect,code",
+ theme_advanced_buttons2 : "",
+ theme_advanced_buttons3 : "",
+ theme_advanced_toolbar_location : "top",
+ theme_advanced_toolbar_align : "center",
+ theme_advanced_blockformats : "blockquote,code",
+ paste_text_sticky : true,
+ entity_encoding : "raw",
+ add_unload_trigger : false,
+ remove_linebreaks : false,
+ force_p_newlines : false,
+ force_br_newlines : true,
+ forced_root_block : '',
+ convert_urls: false,
+ content_css: baseurl+"/view/custom_tinymce.css",
+ theme_advanced_path : false,
+ });
+ });
+ });
+ }
+ </script>
+
+ </div>
diff --git a/view/intros.tpl b/view/intros.tpl
index 4534f2191..d52c3a7aa 100644
--- a/view/intros.tpl
+++ b/view/intros.tpl
@@ -3,7 +3,7 @@
<p class="intro-desc">$str_notifytype $notify_type</p>
<div class="intro-fullname" id="intro-fullname-$contact_id" >$fullname</div>
-<a class="intro-url-link" id="intro-url-link-$contact_id" href="$url" ><img id="photo-$contact_id" class="intro-photo" src="$photo" width="175" height=175" name="$fullname" alt="fullname" /></a>
+<a class="intro-url-link" id="intro-url-link-$contact_id" href="$url" ><img id="photo-$contact_id" class="intro-photo" src="$photo" width="175" height=175" title="$fullname" alt="$fullname" /></a>
<div class="intro-knowyou">$knowyou</div>
<div class="intro-note" id="intro-note-$contact_id">$note</div>
<div class="intro-wrapper-end" id="intro-wrapper-end-$contact_id"></div>
diff --git a/view/jot-header.tpl b/view/jot-header.tpl
index bf2dde8e9..d7a429512 100644
--- a/view/jot-header.tpl
+++ b/view/jot-header.tpl
@@ -1,5 +1,5 @@
-<script language="javascript" type="text/javascript" src="$baseurl/tinymce/jscripts/tiny_mce/tiny_mce_src.js"></script>
+<script language="javascript" type="text/javascript" src="$baseurl/library/tinymce/jscripts/tiny_mce/tiny_mce_src.js"></script>
<script language="javascript" type="text/javascript">
var editor;
diff --git a/view/msg-header.tpl b/view/msg-header.tpl
index 77e58bc09..67775a45b 100644
--- a/view/msg-header.tpl
+++ b/view/msg-header.tpl
@@ -1,5 +1,5 @@
-<script language="javascript" type="text/javascript" src="$baseurl/tinymce/jscripts/tiny_mce/tiny_mce_src.js"></script>
+<script language="javascript" type="text/javascript" src="$baseurl/library/tinymce/jscripts/tiny_mce/tiny_mce_src.js"></script>
<script language="javascript" type="text/javascript">
tinyMCE.init({
diff --git a/view/profed_head.tpl b/view/profed_head.tpl
index 1c1efdbe5..e1df2c4ad 100644
--- a/view/profed_head.tpl
+++ b/view/profed_head.tpl
@@ -1,5 +1,5 @@
<script language="javascript" type="text/javascript"
- src="$baseurl/tinymce/jscripts/tiny_mce/tiny_mce_src.js"></script>
+ src="$baseurl/library/tinymce/jscripts/tiny_mce/tiny_mce_src.js"></script>
<script language="javascript" type="text/javascript">
diff --git a/view/suggestions.tpl b/view/suggestions.tpl
new file mode 100644
index 000000000..46c927754
--- /dev/null
+++ b/view/suggestions.tpl
@@ -0,0 +1,20 @@
+
+<div class="intro-wrapper" >
+
+<p class="intro-desc">$str_notifytype $notify_type</p>
+<div class="intro-madeby">$madeby</div>
+<div class="intro-fullname" >$fullname</div>
+<a class="intro-url-link" href="$url" ><img class="intro-photo" src="$photo" width="175" height=175" title="$fullname" alt="$fullname" /></a>
+<div class="intro-note" >$note</div>
+<div class="intro-wrapper-end"></div>
+<form class="intro-form" action="notifications/$intro_id" method="post">
+<input class="intro-submit-ignore" type="submit" name="submit" value="$ignore" />
+<input class="intro-submit-discard" type="submit" name="submit" value="$discard" />
+</form>
+<div class="intro-form-end"></div>
+
+<form class="intro-approve-form" action="$request" method="get">
+<input class="intro-submit-approve" type="submit" name="submit" value="$approve" />
+</form>
+</div>
+<div class="intro-end"></div>
diff --git a/view/theme/darkzero/style.css b/view/theme/darkzero/style.css
index c92529f26..3459e7409 100644
--- a/view/theme/darkzero/style.css
+++ b/view/theme/darkzero/style.css
@@ -7,7 +7,7 @@ a:hover {text-decoration: underline; }
input, select, textarea {
background-color: #222222;
- color: #FFFFFF;
+ color: #FFFFFF !important;
border: 1px solid #444444;
}
.openid { background-color: #222222;}
diff --git a/view/theme/dispy/jot-header.tpl b/view/theme/dispy/jot-header.tpl
index aa9e0bfaf..eb88f00c1 100644
--- a/view/theme/dispy/jot-header.tpl
+++ b/view/theme/dispy/jot-header.tpl
@@ -1,5 +1,5 @@
-<script language="javascript" type="text/javascript" src="$baseurl/tinymce/jscripts/tiny_mce/tiny_mce_src.js"></script>
+<script language="javascript" type="text/javascript" src="$baseurl/library/tinymce/jscripts/tiny_mce/tiny_mce_src.js"></script>
<script language="javascript" type="text/javascript">
var editor;
@@ -110,6 +110,24 @@ tinyMCE.init({
});
+ function deleteCheckedItems() {
+ var checkedstr = '';
+
+ $('.item-select').each( function() {
+ if($(this).is(':checked')) {
+ if(checkedstr.length != 0) {
+ checkedstr = checkedstr + ',' + $(this).val();
+ }
+ else {
+ checkedstr = $(this).val();
+ }
+ }
+ });
+ $.post('item', { dropitems: checkedstr }, function(data) {
+ window.location.reload();
+ });
+ }
+
function jotGetLink() {
reply = prompt("$linkurl");
if(reply && reply.length) {
diff --git a/view/theme/dispy/style.css b/view/theme/dispy/style.css
index 555b0af4f..49586e307 100644
--- a/view/theme/dispy/style.css
+++ b/view/theme/dispy/style.css
@@ -692,6 +692,15 @@ div[id$="wrapper"] br { clear: left; }
.mail-list-delete-wrapper { float: right; }
.mail-list-outside-wrapper-end { clear: both;}
+.mail-conv-sender {float: left; margin: 0px 5px 5px 0px }
+.mail-conv-sender-photo { width: 32px; height: 32px }
+.mail-conv-sender-name { float: left }
+.mail-conv-date { float: right }
+.mail-conv-subject { clear: right; font-weight: bold; font-size: 1.2em }
+.mail-conv-body { clear: both; }
+.mail-conv-delete-wrapper { margin-top: 5px; }
+
+
/**
* contacts
*/
diff --git a/view/theme/duepuntozero/style.css b/view/theme/duepuntozero/style.css
index c6ce8ea2c..4df36b4a9 100644
--- a/view/theme/duepuntozero/style.css
+++ b/view/theme/duepuntozero/style.css
@@ -249,6 +249,17 @@ div.wall-item-content-wrapper.shiny {
cursor: pointer;
}
+#group-sidebar {
+ margin-bottom: 10px;
+}
+
+.group-selected {
+ padding: 3px;
+ border: 1px solid #CCCCCC;
+ background: #F8F8F8;
+ font-weight: bold;
+}
+
.fakelink:hover {
color: #3465a4;
text-decoration: underline;
@@ -881,6 +892,19 @@ input#dfrn-url {
clear: both;
}
+#fsuggest-desc, #fsuggest-submit-wrapper {
+ margin-top: 15px;
+ margin-bottom: 15px;
+}
+
+#network-star-link{
+ margin-top: 10px;
+}
+.network-star {
+ float: left;
+ margin-right: 5px;
+}
+
.wall-item-content-wrapper {
margin-top: 10px;
border: 1px solid #CCC;
@@ -998,8 +1022,12 @@ input#dfrn-url {
.wall-item-like-buttons {
float: left;
margin-right: 10px;
- padding-right: 10px;
- border-right: 2px solid #fff;
+/* padding-right: 10px; */
+/* border-right: 2px solid #fff; */
+}
+
+.like-rotator {
+ margin-left: 5px;
}
.wall-item-like-buttons > a,
@@ -1013,10 +1041,16 @@ input#dfrn-url {
.wall-item-share-buttons {
margin-left: 10px;
+ margin-right: 10px;
}
.editpost {
- margin-left: 15px;
+ margin-left: 10px;
+ float: left;
+}
+.star-item {
+ margin-left: 10px;
+ float: left;
}
.wall-item-links-wrapper {
@@ -2346,6 +2380,9 @@ a.mail-list-link {
.profile-match-wrapper {
float: left;
padding: 10px;
+ width: 120px;
+ height: 120px;
+ scroll: auto;
}
#profile-match-wrapper-end {
clear: both;
@@ -2532,6 +2569,43 @@ a.mail-list-link {
}
/**
+ * Plugins settings
+ */
+
+.settings-block > h3,
+.settings-heading {
+ border-bottom: 1px solid #babdb6;
+}
+
+
+/**
+ * Form fields
+ */
+.field {
+ clear: left;
+ margin-bottom: 5px;
+ padding-bottom: 5px;
+}
+
+.field label {
+ float: left;
+ width: 200px;
+}
+
+.field input,
+.field textarea {
+ width: 400px;
+}
+.field textarea { height: 100px; }
+.field_help {
+ display: block;
+ margin-left: 200px;
+ color: #666666;
+
+}
+
+
+/**
* ADMIN
*/
#pending-update {
@@ -2557,34 +2631,12 @@ a.mail-list-link {
margin-left: 200px;
}
-#adminpage .field {
- clear: left;
- margin-bottom: 5px;
- padding-bottom: 5px;
+#adminpage h3 {
+ border-bottom: 1px solid #cccccc;
}
-
#adminpage .field label {
- float: left;
- width: 200px;
font-weight: bold;
}
-
-#adminpage .field input,
-#adminpage .field textarea {
- width: 400px;
-}
-#adminpage .field textarea { height: 100px; }
-#adminpage .field_help {
- display: block;
- margin-left: 200px;
- color: #666666;
-
-}
-
-#adminpage h3 {
- border-bottom: 1px solid #cccccc;
-}
-
#adminpage .submit {
clear:left;
text-align: right;
@@ -2607,7 +2659,7 @@ a.mail-list-link {
margin-right: 1em;
}
-#adminpage table {width:100%; border-bottom: 1p solid #000000; margin: 5px 0px;}
+#adminpage table {width:100%; border-bottom: 1px solid #000000; margin: 5px 0px;}
#adminpage table th { text-align: left;}
#adminpage td .icon { float: left;}
#adminpage table#users img { width: 16px; height: 16px; }
@@ -2654,6 +2706,9 @@ a.mail-list-link {
.on { background-position: -144px -32px; }
.off { background-position: 0px -48px; }
+.starred { background-position: -16px -48px; }
+.unstarred { background-position: -32px -48px; }
+
.icon.dim { opacity: 0.3;filter:alpha(opacity=30); }
@@ -2667,9 +2722,9 @@ a.mail-list-link {
margin-top: 10px;
}
-.type-video { background-position: 0px; 0px; }
-.type-image { background-position: -20px; 0px; }
-.type-audio { background-position: -40px; 0px; }
-.type-text { background-position: -60px; 0px; }
-.type-unkn { background-position: -80px; 0px; }
+.type-video { background-position: 0px 0px; }
+.type-image { background-position: -20px 0px; }
+.type-audio { background-position: -40px 0px; }
+.type-text { background-position: -60px 0px; }
+.type-unkn { background-position: -80px 0px; }
diff --git a/view/theme/loozah/style.css b/view/theme/loozah/style.css
index 98ab96d2b..df14a29db 100644
--- a/view/theme/loozah/style.css
+++ b/view/theme/loozah/style.css
@@ -137,6 +137,18 @@ blockquote:before {
cursor: pointer;
}
+
+#group-sidebar {
+ margin-bottom: 10px;
+}
+
+.group-selected {
+ padding: 3px;
+ border: 1px solid #CCCCCC;
+ background: #F8F8F8;
+ font-weight: bold;
+}
+
.fakelink:hover {
color: #0CBEFE;
text-decoration: none;
@@ -997,6 +1009,13 @@ input#dfrn-url {
clear: both;
}
+
+#fsuggest-desc, #fsuggest-submit-wrapper {
+ margin-top: 15px;
+ margin-bottom: 15px;
+}
+
+
.wall-item-content-wrapper {
margin-top: 10px;
border: 1px solid #CCC;
@@ -1077,9 +1096,24 @@ input#dfrn-url {
}
.editpost {
- margin-left: 15px;
+ margin-left: 10px;
+ float: left;
+}
+.star-item {
+ margin-left: 10px;
+ float: left;
}
+
+#network-star-link{
+ margin-top: 10px;
+}
+.network-star {
+ float: left;
+ margin-right: 5px;
+}
+
+
.wall-item-info.wallwall {
width: 285px;
}
@@ -2307,6 +2341,10 @@ a.mail-list-link {
.profile-match-wrapper {
float: left;
padding: 10px;
+ width: 120px;
+ height: 120px;
+ scroll: auto;
+
}
#profile-match-wrapper-end {
clear: both;
@@ -2552,6 +2590,33 @@ a.mail-list-link {
left: 0px;
top: 0px;
}
+/**
+ * Form fields
+ */
+.field {
+ clear: left;
+ margin-bottom: 5px;
+ padding-bottom: 5px;
+}
+
+.field label {
+ float: left;
+ width: 200px;
+ font-weight: bold;
+}
+
+.field input,
+.field textarea {
+ width: 400px;
+}
+.field textarea { height: 100px; }
+.field_help {
+ display: block;
+ margin-left: 200px;
+ color: #666666;
+
+}
+
/**
* ADMIN
@@ -2579,30 +2644,6 @@ a.mail-list-link {
margin-left: 200px;
}
-#adminpage .field {
- clear: left;
- margin-bottom: 5px;
- padding-bottom: 5px;
-}
-
-#adminpage .field label {
- float: left;
- width: 200px;
- font-weight: bold;
-}
-
-#adminpage .field input,
-#adminpage .field textarea {
- width: 400px;
-}
-#adminpage .field textarea { height: 100px; }
-#adminpage .field_help {
- display: block;
- margin-left: 200px;
- color: #666666;
-
-}
-
#adminpage h3 {
border-bottom: 1px solid #cccccc;
}
@@ -2674,6 +2715,8 @@ a.mail-list-link {
.on { background-position: -144px -32px; }
.off { background-position: 0px -48px; }
+.starred { background-position: -16px -48px; }
+.unstarred { background-position: -32px -48px; }
.icon.dim { opacity: 0.3;filter:alpha(opacity=30); }
diff --git a/view/wall_item.tpl b/view/wall_item.tpl
index a95097be1..1c5e82b17 100644
--- a/view/wall_item.tpl
+++ b/view/wall_item.tpl
@@ -34,6 +34,7 @@
$vote
$plink
$edpost
+ $star
$drop
</div>
</div>
diff --git a/view/wallwall_item.tpl b/view/wallwall_item.tpl
index 39c14cf4f..fd686f0f4 100644
--- a/view/wallwall_item.tpl
+++ b/view/wallwall_item.tpl
@@ -38,6 +38,7 @@
$vote
$plink
$edpost
+ $star
$drop
</div>
</div>
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-11 18:16:44 +0000