aboutsummaryrefslogtreecommitdiffstats
path: root/view
diff options
context:
space:
mode:
Diffstat (limited to 'view')
-rw-r--r--[-rwxr-xr-x]view/mail_list.tpl2
-rwxr-xr-xview/profile_vcard.tpl4
-rw-r--r--view/theme/diabook-blue/icons/com_side.pngbin0 -> 680 bytes
-rw-r--r--view/theme/diabook-blue/icons/events.pngbin0 -> 663 bytes
-rw-r--r--view/theme/diabook-blue/icons/home.pngbin0 -> 722 bytes
-rw-r--r--view/theme/diabook-blue/icons/mess_side.pngbin0 -> 664 bytes
-rw-r--r--view/theme/diabook-blue/icons/notes.pngbin0 -> 739 bytes
-rw-r--r--view/theme/diabook-blue/icons/pubgroups.pngbin0 -> 710 bytes
-rw-r--r--[-rwxr-xr-x]view/theme/diabook-blue/icons/toogle_off.pngbin391 -> 834 bytes
-rw-r--r--[-rwxr-xr-x]view/theme/diabook-blue/icons/toogle_on.pngbin429 -> 715 bytes
-rwxr-xr-xview/theme/diabook-blue/photo_album.tpl7
-rwxr-xr-xview/theme/diabook-blue/photo_top.tpl7
-rwxr-xr-xview/theme/diabook-blue/photo_view.tpl2
-rw-r--r--view/theme/diabook-blue/profile_side.tpl11
-rw-r--r--view/theme/diabook-blue/style.css92
-rwxr-xr-xview/theme/diabook-blue/theme.php15
-rw-r--r--[-rwxr-xr-x]view/theme/diabook/icons/toogle_off.pngbin391 -> 834 bytes
-rw-r--r--[-rwxr-xr-x]view/theme/diabook/icons/toogle_on.pngbin429 -> 715 bytes
-rw-r--r--view/theme/diabook/profile_side.tpl3
-rw-r--r--view/theme/diabook/style.css38
-rwxr-xr-xview/theme/diabook/theme.php9
-rw-r--r--view/theme/dispy-dark/contact_template.tpl2
-rw-r--r--view/theme/dispy-dark/group_side.tpl6
-rw-r--r--view/theme/dispy-dark/head.tpl19
-rw-r--r--view/theme/dispy-dark/jot-header.tpl14
-rw-r--r--view/theme/dispy-dark/nets.tpl2
-rw-r--r--view/theme/dispy-dark/profile_vcard.tpl38
-rw-r--r--view/theme/dispy-dark/saved_searches_aside.tpl2
-rw-r--r--view/theme/dispy-dark/style.css71
-rw-r--r--view/theme/dispy-dark/theme.php25
-rw-r--r--view/theme/dispy-dark/wall_item.tpl5
-rw-r--r--view/theme/dispy-dark/wallwall_item.tpl7
-rw-r--r--view/theme/dispy/theme.php3
-rwxr-xr-xview/theme/duepuntozero/wall_item.tpl5
-rwxr-xr-xview/theme/duepuntozero/wallwall_item.tpl4
35 files changed, 276 insertions, 117 deletions
diff --git a/view/mail_list.tpl b/view/mail_list.tpl
index b284ffb0e..22e35dec8 100755..100644
--- a/view/mail_list.tpl
+++ b/view/mail_list.tpl
@@ -1,6 +1,6 @@
<div class="mail-list-outside-wrapper">
<div class="mail-list-sender" >
- <a href="$from_url" class="mail-list-sender-url" ><img class="mail-list-sender-photo$sparkle" src="$from_photo" height="80 width="80" alt="$from_name" /></a>
+ <a href="$from_url" class="mail-list-sender-url" ><img class="mail-list-sender-photo$sparkle" src="$from_photo" height="80" width="80" alt="$from_name" /></a>
</div>
<div class="mail-list-detail">
<div class="mail-list-sender-name" >$from_name</div>
diff --git a/view/profile_vcard.tpl b/view/profile_vcard.tpl
index 5bcbfd0b0..7cd02f164 100755
--- a/view/profile_vcard.tpl
+++ b/view/profile_vcard.tpl
@@ -18,8 +18,8 @@
</div>
{{ endif }}
</div>
-
-
+
+
{{ if $pdesc }}<div class="title">$profile.pdesc</div>{{ endif }}
<div id="profile-photo-wrapper"><img class="photo" width="175" height="175" src="$profile.photo?rev=$profile.picdate" alt="$profile.name" /></div>
diff --git a/view/theme/diabook-blue/icons/com_side.png b/view/theme/diabook-blue/icons/com_side.png
new file mode 100644
index 000000000..bc5969ef1
--- /dev/null
+++ b/view/theme/diabook-blue/icons/com_side.png
Binary files differ
diff --git a/view/theme/diabook-blue/icons/events.png b/view/theme/diabook-blue/icons/events.png
new file mode 100644
index 000000000..4a0b3f3f1
--- /dev/null
+++ b/view/theme/diabook-blue/icons/events.png
Binary files differ
diff --git a/view/theme/diabook-blue/icons/home.png b/view/theme/diabook-blue/icons/home.png
new file mode 100644
index 000000000..be47a48fc
--- /dev/null
+++ b/view/theme/diabook-blue/icons/home.png
Binary files differ
diff --git a/view/theme/diabook-blue/icons/mess_side.png b/view/theme/diabook-blue/icons/mess_side.png
new file mode 100644
index 000000000..49ef896bc
--- /dev/null
+++ b/view/theme/diabook-blue/icons/mess_side.png
Binary files differ
diff --git a/view/theme/diabook-blue/icons/notes.png b/view/theme/diabook-blue/icons/notes.png
new file mode 100644
index 000000000..7d4afca90
--- /dev/null
+++ b/view/theme/diabook-blue/icons/notes.png
Binary files differ
diff --git a/view/theme/diabook-blue/icons/pubgroups.png b/view/theme/diabook-blue/icons/pubgroups.png
new file mode 100644
index 000000000..acf857f32
--- /dev/null
+++ b/view/theme/diabook-blue/icons/pubgroups.png
Binary files differ
diff --git a/view/theme/diabook-blue/icons/toogle_off.png b/view/theme/diabook-blue/icons/toogle_off.png
index 99490bcd9..0fcce4d5a 100755..100644
--- a/view/theme/diabook-blue/icons/toogle_off.png
+++ b/view/theme/diabook-blue/icons/toogle_off.png
Binary files differ
diff --git a/view/theme/diabook-blue/icons/toogle_on.png b/view/theme/diabook-blue/icons/toogle_on.png
index 81e8f9120..79ce07f0e 100755..100644
--- a/view/theme/diabook-blue/icons/toogle_on.png
+++ b/view/theme/diabook-blue/icons/toogle_on.png
Binary files differ
diff --git a/view/theme/diabook-blue/photo_album.tpl b/view/theme/diabook-blue/photo_album.tpl
new file mode 100755
index 000000000..7e6c2f666
--- /dev/null
+++ b/view/theme/diabook-blue/photo_album.tpl
@@ -0,0 +1,7 @@
+<div class="photo-album-image-wrapper" id="photo-album-image-wrapper-$id">
+ <a href="$imgsrc" rel="gallery" class="fancy-album" id="photo-album-photo-link-$id" title="$phototitle">
+ <img src="$imgsrc" alt="$imgalt" title="$phototitle" class="photo-album-photo lframe resize" id="photo-album-photo-$id" />
+ <p class='caption'>$desc</p>
+ </a>
+</div>
+<div class="photo-album-image-wrapper-end"></div>
diff --git a/view/theme/diabook-blue/photo_top.tpl b/view/theme/diabook-blue/photo_top.tpl
new file mode 100755
index 000000000..98ac9c457
--- /dev/null
+++ b/view/theme/diabook-blue/photo_top.tpl
@@ -0,0 +1,7 @@
+
+<div class="photo-top-image-wrapper lframe" id="photo-top-image-wrapper-$id">
+ <a href="$photo.src" rel="$photo.album.name" class="fancy-album" id="photo-top-photo-link-$photo.id" title="$photo.title">
+ <img src="$photo.src" alt="$photo.alt" title="$photo.title" class="photo-top-album-img" id="photo-top-photo-$photo.id" />
+ </a>
+ <div class="photo-top-album-name"><a href="$photo.album.link" class="photo-top-album-link" title="$photo.album.alt" >$photo.album.name</a></div>
+</div>
diff --git a/view/theme/diabook-blue/photo_view.tpl b/view/theme/diabook-blue/photo_view.tpl
index 511fc73ac..902c2a0ed 100755
--- a/view/theme/diabook-blue/photo_view.tpl
+++ b/view/theme/diabook-blue/photo_view.tpl
@@ -12,7 +12,7 @@
<div id="photo-photo">
{{ if $prevlink }}<div id="photo-prev-link"><a href="$prevlink.0">$prevlink.1</a></div>{{ endif }}
- <a href="$photo.href" class="lightbox" title="$photo.title"><img src="$photo.src" /></a>
+ <a href="$photo.href" class="fancy-photo" title="$photo.title"><img src="$photo.src" /></a>
{{ if $nextlink }}<div id="photo-next-link"><a href="$nextlink.0">$nextlink.1</a></div>{{ endif }}
</div>
diff --git a/view/theme/diabook-blue/profile_side.tpl b/view/theme/diabook-blue/profile_side.tpl
index 595684bf5..a65677696 100644
--- a/view/theme/diabook-blue/profile_side.tpl
+++ b/view/theme/diabook-blue/profile_side.tpl
@@ -7,11 +7,12 @@
</div>
<ul id="profile-side-menu" class="menu-profile-side">
- <li id="profile-side-status" class="menu-profile-list"><a class="menu-profile-list-item" href="$ps.usermenu.status.0">$ps.usermenu.status.1</a></li>
- <li id="profile-side-profile" class="menu-profile-list"><a class="menu-profile-list-item" href="$ps.usermenu.profile.0">$ps.usermenu.profile.1</a></li>
- <li id="profile-side-photos" class="menu-profile-list"><a class="menu-profile-list-item" href="$ps.usermenu.photos.0">$ps.usermenu.photos.1</a></li>
- <li id="profile-side-events" class="menu-profile-list"><a class="menu-profile-list-item" href="$ps.usermenu.events.0">$ps.usermenu.events.1</a></li>
- <li id="profile-side-notes" class="menu-profile-list"><a class="menu-profile-list-item" href="$ps.usermenu.notes.0">$ps.usermenu.notes.1</a></li>
+ <li id="profile-side-status" class="menu-profile-list home"><a class="menu-profile-list-item" href="$ps.usermenu.status.0">$ps.usermenu.status.1</a></li>
+ <li id="profile-side-photos" class="menu-profile-list photos"><a class="menu-profile-list-item" href="$ps.usermenu.photos.0">$ps.usermenu.photos.1</a></li>
+ <li id="profile-side-events" class="menu-profile-list events"><a class="menu-profile-list-item" href="$ps.usermenu.events.0">$ps.usermenu.events.1</a></li>
+ <li id="profile-side-notes" class="menu-profile-list notes"><a class="menu-profile-list-item" href="$ps.usermenu.notes.0">$ps.usermenu.notes.1</a></li>
+ <li id="profile-side-foren" class="menu-profile-list foren"><a class="menu-profile-list-item" href="http://dir.friendika.com/directory/forum" target="blanc">Public Groups</a></li>
+ <li id="profile-side-foren" class="menu-profile-list com_side"><a class="menu-profile-list-item" href="$ps.usermenu.community.0">$ps.usermenu.community.1</a></li>
</ul>
</div>
diff --git a/view/theme/diabook-blue/style.css b/view/theme/diabook-blue/style.css
index 514314049..738dde0e5 100644
--- a/view/theme/diabook-blue/style.css
+++ b/view/theme/diabook-blue/style.css
@@ -461,7 +461,7 @@ code {
}
#panel {
position: absolute;
- width: 10em;
+ width: 12em;
background: #ffffff;
color: #2d2d2d;
margin: 0px;
@@ -780,8 +780,6 @@ ul.menu-popup {
margin: 0px;
padding: 0px;
list-style: none;
- border: 1px solid #364e59;
- border-top-color: transparent;
z-index: 100000;
-webkit-box-shadow: 0px 5px 10px rgba(0, 0, 0, 0.7);
-moz-box-shadow: 0px 5px 10px rgba(0, 0, 0, 0.7);
@@ -893,22 +891,47 @@ ul.menu-popup .empty {
text-decoration: none;
}
.menu-profile-side{
- list-style: none;
- padding-left: 16px;
- min-height: 16px;
+ list-style: none;
+ padding-left: 0px;
+ min-height: 0px;
}
.menu-profile-list{
height: auto;
overflow: auto;
padding-top: 3px;
padding-bottom: 3px;
+ padding-left: 16px;
+ min-height: 16px;
+ list-style: none;
}
.menu-profile-list:hover{
background: #EEE;
}
+.menu-profile-list-item{
+ padding-left: 5px;
+ }
.menu-profile-list-item:hover{
- text-decoration: none;
+ text-decoration: none;
}
+/*http://prothemedesign.com/circular-icons/*/
+.menu-profile-list.home{
+ background: url("../../../view/theme/diabook-blue/icons/home.png") no-repeat;
+ }
+.menu-profile-list.photos{
+ background: url("../../../view/theme/diabook-blue/icons/mess_side.png") no-repeat;
+ }
+.menu-profile-list.events{
+ background: url("../../../view/theme/diabook-blue/icons/events.png") no-repeat;
+ }
+.menu-profile-list.notes{
+ background: url("../../../view/theme/diabook-blue/icons/notes.png") no-repeat;
+ }
+.menu-profile-list.foren{
+ background: url("../../../view/theme/diabook-blue/icons/pubgroups.png") no-repeat;
+ }
+.menu-profile-list.com_side{
+ background: url("../../../view/theme/diabook-blue/icons/com_side.png") no-repeat;
+ }
/* aside */
aside {
display: table-cell;
@@ -1068,6 +1091,16 @@ aside #side-peoplefind-url {
min-height: 16px;
list-style: none;
}
+#side-bar-photos-albums li{
+list-style-type: disc;
+}
+#side-bar-photos-albums ul li{
+ margin-left: 30px;
+ padding-left: 0px;
+ }
+#side-bar-photos-albums ul li a{
+ color: #1872A2;
+}
.widget .tool.selected {
background: url("../../../view/theme/diabook-blue/icons/selected.png") no-repeat left center;
}
@@ -1922,7 +1955,7 @@ max-width: 85%;
}
.lframe {
float: left;
- margin: 0px 10px 10px 0px;
+ /*margin: 0px 10px 10px 0px;*/
}
/* profile match wrapper */
.profile-match-wrapper {
@@ -2209,6 +2242,9 @@ a.mail-list-link {
.calendar {
font-family: Courier, monospace;
}
+.calendar.eventcal a {
+ color: #1872A2;
+ }
.today {
font-weight: bold;
color: #FF0000;
@@ -2362,8 +2398,42 @@ float: left;
.contact-details {
color: #999999;
}
-
-.photo-top-image-wrapper {
+#side-bar-photos-albums{
+ margin-top: 15px;
+ }
+.photo-top-photo, .photo-album-photo {
+ -webkit-border-radius: 5px 5px 0 0;
+ -moz-border-radius: 5px 5px 0 0;
+ border-radius: 5px 5px 0 0;
+}
+.photo-album-image-wrapper, .photo-top-image-wrapper {
+ float: left;
+ -moz-box-shadow: 0 0 5px #888;
+ -webkit-box-shadow: 0 0 5px #888;
+ box-shadow: 0 0 5px #888;
+ background-color: #EEE;
+ -webkit-border-radius: 5px;
+ -moz-border-radius: 5px;
+ border-radius: 5px;
+ padding-bottom: 20px;
+ position: relative;
+ margin: 0 10px 10px 0;
+ overflow: hidden;
+ float: left;
+ position: relative;
+}
+.photo-top-album-name {
+ position: absolute;
+ bottom: 0;
+ padding: 0 5px;
+}
+.photo-top-album-link{
+ color: #1872A2;
+ }
+.photo-top-album-img{
+
+ }
+/*.photo-top-image-wrapper {
position: relative;
float: left;
margin-top: 15px;
@@ -2379,7 +2449,7 @@ float: left;
padding: 0px 3px;
padding-top: 0.5em;
background-color: rgb(255, 255, 255);
-}
+}*/
#photo-top-end {
clear: both;
}
diff --git a/view/theme/diabook-blue/theme.php b/view/theme/diabook-blue/theme.php
index 75abb2fdf..f9128ea1f 100755
--- a/view/theme/diabook-blue/theme.php
+++ b/view/theme/diabook-blue/theme.php
@@ -11,9 +11,9 @@ $a->theme_info = array(
'extends' => 'diabook',
);
-//profile_side
-
+//fancybox: provide $photo.href to photo_top.tpl to img in org. scale
+//profile_side
$nav['usermenu']=array();
$userinfo = null;
@@ -34,7 +34,7 @@ $ps['usermenu'][profile] = Array('profile/' . $a->user['nickname']. '?tab=profil
$ps['usermenu'][photos] = Array('photos/' . $a->user['nickname'], t('Photos'), "", t('Your photos'));
$ps['usermenu'][events] = Array('events/', t('Events'), "", t('Your events'));
$ps['usermenu'][notes] = Array('notes/', t('Personal notes'), "", t('Your personal photos'));
-
+$ps['usermenu'][community] = Array('community/', t('Community'), "", "");
if($is_url = preg_match ("/\bnetwork\b/i", $_SERVER['REQUEST_URI'])) {
$tpl = get_markup_template('profile_side.tpl');
@@ -110,10 +110,15 @@ $('html').click(function() {
event.stopPropagation();
});
- $(function() {
- $('a.lightbox').fancybox(); // Select all links with lightbox class
+
+
+ $(document).ready(function() {
+ $("a.fancy-photo").fancybox(); // Select all links with lightbox class
+ $("a.fancy-album").fancybox();
});
+
+
</script>
EOT;
diff --git a/view/theme/diabook/icons/toogle_off.png b/view/theme/diabook/icons/toogle_off.png
index 99490bcd9..0fcce4d5a 100755..100644
--- a/view/theme/diabook/icons/toogle_off.png
+++ b/view/theme/diabook/icons/toogle_off.png
Binary files differ
diff --git a/view/theme/diabook/icons/toogle_on.png b/view/theme/diabook/icons/toogle_on.png
index 81e8f9120..79ce07f0e 100755..100644
--- a/view/theme/diabook/icons/toogle_on.png
+++ b/view/theme/diabook/icons/toogle_on.png
Binary files differ
diff --git a/view/theme/diabook/profile_side.tpl b/view/theme/diabook/profile_side.tpl
index 595684bf5..01da55ce1 100644
--- a/view/theme/diabook/profile_side.tpl
+++ b/view/theme/diabook/profile_side.tpl
@@ -8,10 +8,11 @@
<ul id="profile-side-menu" class="menu-profile-side">
<li id="profile-side-status" class="menu-profile-list"><a class="menu-profile-list-item" href="$ps.usermenu.status.0">$ps.usermenu.status.1</a></li>
- <li id="profile-side-profile" class="menu-profile-list"><a class="menu-profile-list-item" href="$ps.usermenu.profile.0">$ps.usermenu.profile.1</a></li>
<li id="profile-side-photos" class="menu-profile-list"><a class="menu-profile-list-item" href="$ps.usermenu.photos.0">$ps.usermenu.photos.1</a></li>
<li id="profile-side-events" class="menu-profile-list"><a class="menu-profile-list-item" href="$ps.usermenu.events.0">$ps.usermenu.events.1</a></li>
<li id="profile-side-notes" class="menu-profile-list"><a class="menu-profile-list-item" href="$ps.usermenu.notes.0">$ps.usermenu.notes.1</a></li>
+ <li id="profile-side-foren" class="menu-profile-list"><a class="menu-profile-list-item" href="http://dir.friendika.com/directory/forum" target="blanc">Public Groups</a></li>
+ <li id="profile-side-foren" class="menu-profile-list"><a class="menu-profile-list-item" href="$ps.usermenu.community.0">$ps.usermenu.community.1</a></li>
</ul>
</div>
diff --git a/view/theme/diabook/style.css b/view/theme/diabook/style.css
index df692cbc6..437f323fa 100644
--- a/view/theme/diabook/style.css
+++ b/view/theme/diabook/style.css
@@ -462,7 +462,7 @@ code {
}
#panel {
position: absolute;
- width: 10em;
+ width: 12em;
background: #ffffff;
color: #2d2d2d;
margin: 0px;
@@ -769,8 +769,6 @@ ul.menu-popup {
margin: 0px;
padding: 0px;
list-style: none;
- border: 1px solid #364e59;
- border-top-color: transparent;
z-index: 100000;
-webkit-box-shadow: 0px 5px 10px rgba(0, 0, 0, 0.7);
-moz-box-shadow: 0px 5px 10px rgba(0, 0, 0, 0.7);
@@ -1904,7 +1902,6 @@ ul.tabs li .active {
/* photo */
.lframe {
float: left;
- margin: 0px 10px 10px 0px;
}
/* profile match wrapper */
.profile-match-wrapper {
@@ -2352,7 +2349,36 @@ float: left;
color: #999999;
}
-.photo-top-image-wrapper {
+#side-bar-photos-albums{
+ margin-top: 15px;
+ }
+.photo-top-photo, .photo-album-photo {
+ -webkit-border-radius: 5px 5px 0 0;
+ -moz-border-radius: 5px 5px 0 0;
+ border-radius: 5px 5px 0 0;
+}
+.photo-album-image-wrapper, .photo-top-image-wrapper {
+ float: left;
+ -moz-box-shadow: 0 0 5px #888;
+ -webkit-box-shadow: 0 0 5px #888;
+ box-shadow: 0 0 5px #888;
+ background-color: #EEE;
+ -webkit-border-radius: 5px;
+ -moz-border-radius: 5px;
+ border-radius: 5px;
+ padding-bottom: 20px;
+ position: relative;
+ margin: 0 10px 10px 0;
+}
+.photo-top-album-name {
+ position: absolute;
+ bottom: 0;
+ padding: 0 5px;
+}
+.photo-top-album-link{
+ color: #1872A2;
+ }
+/*.photo-top-image-wrapper {
position: relative;
float: left;
margin-top: 15px;
@@ -2368,7 +2394,7 @@ float: left;
padding: 0px 3px;
padding-top: 0.5em;
background-color: rgb(255, 255, 255);
-}
+}*/
#photo-top-end {
clear: both;
}
diff --git a/view/theme/diabook/theme.php b/view/theme/diabook/theme.php
index 9b3ed30b0..9093ac2ca 100755
--- a/view/theme/diabook/theme.php
+++ b/view/theme/diabook/theme.php
@@ -1,8 +1,8 @@
<?php
/*
- * Name: Diabook
- * Description: Diabook: report bugs and request here: http://pad.toktan.org/p/diabook or contact me : thomas_bierey@friendica.eu
+ * Name: Diabook-blue
+ * Description: Diabook-blue: report bugs and request here: http://pad.toktan.org/p/diabook or contact me : thomas_bierey@friendica.eu
* Version:
* Author:
*/
@@ -34,7 +34,7 @@ $ps['usermenu'][profile] = Array('profile/' . $a->user['nickname']. '?tab=profil
$ps['usermenu'][photos] = Array('photos/' . $a->user['nickname'], t('Photos'), "", t('Your photos'));
$ps['usermenu'][events] = Array('events/', t('Events'), "", t('Your events'));
$ps['usermenu'][notes] = Array('notes/', t('Personal notes'), "", t('Your personal photos'));
-
+$ps['usermenu'][community] = Array('community/', t('Community'), "", "");
if($is_url = preg_match ("/\bnetwork\b/i", $_SERVER['REQUEST_URI'])) {
$tpl = get_markup_template('profile_side.tpl');
@@ -46,8 +46,7 @@ $a->page['aside'] .= replace_macros($tpl, array(
}
}
-//js script
-
+//js scripts
$a->page['htmlhead'] .= <<< EOT
<script>
diff --git a/view/theme/dispy-dark/contact_template.tpl b/view/theme/dispy-dark/contact_template.tpl
index fbf354b47..04968bd07 100644
--- a/view/theme/dispy-dark/contact_template.tpl
+++ b/view/theme/dispy-dark/contact_template.tpl
@@ -20,9 +20,11 @@
</div>
<div class="contact-entry-photo-end" ></div>
<div class="contact-entry-name" id="contact-entry-name-$contact.id" >$contact.name</div>
+{{ if $contact.alt_text }}<div class="contact-entry-details" id="contact-entry-rel-$contact.id" >$contact.alt_text</div>{{ endif }}
<div class="contact-entry-details" id="contact-entry-url-$contact.id" >
<a href="$contact.itemurl" title="$contact.itemurl">Profile URL</a></div>
<div class="contact-entry-details" id="contact-entry-network-$contact.id" >$contact.network</div>
<div class="contact-entry-end" ></div>
</div>
+
diff --git a/view/theme/dispy-dark/group_side.tpl b/view/theme/dispy-dark/group_side.tpl
index 516d70d5b..10ecec2e8 100644
--- a/view/theme/dispy-dark/group_side.tpl
+++ b/view/theme/dispy-dark/group_side.tpl
@@ -1,5 +1,5 @@
-<div class="widget" id="group-sidebar">
-<h3>$title</h3>
+<div id="group-sidebar" class="widget">
+<h3 class="label">$title</h3>
<div id="sidebar-group-list">
<ul id="sidebar-group-ul">
@@ -9,7 +9,7 @@
{{ if $group.edit }}
<a
class="groupsideedit"
- href="$group.edit.href" title="$edittext"><span class="icon small-pencil"></span></a>
+ href="$group.edit.href" title="$group.edit.title"><span class="icon small-pencil"></span></a>
{{ endif }}
{{ if $group.cid }}
<input type="checkbox"
diff --git a/view/theme/dispy-dark/head.tpl b/view/theme/dispy-dark/head.tpl
index 793af6fd2..f606f2f7e 100644
--- a/view/theme/dispy-dark/head.tpl
+++ b/view/theme/dispy-dark/head.tpl
@@ -74,25 +74,6 @@
}
}
- $(document).ready(function() {
- function toggleToolbar() {
- if ( $('#nav-floater').is(':visible') ) {
- $('#nav-floater').slideUp('fast');
- $('.floaterflip').css({
- backgroundPosition: '-210px -60px'
- });
- } else {
- $('#nav-floater').slideDown('fast');
- $('.floaterflip').css({
- backgroundPosition: '-190px -60px'
- });
- }
- };
- $('.floaterflip').click(function() {
- toggleToolbar();
- return false;
- });
- });
</script>
diff --git a/view/theme/dispy-dark/jot-header.tpl b/view/theme/dispy-dark/jot-header.tpl
index 43dcdbb84..4c8f59d79 100644
--- a/view/theme/dispy-dark/jot-header.tpl
+++ b/view/theme/dispy-dark/jot-header.tpl
@@ -114,6 +114,7 @@ function enableOnUser(){
$(this).val("");
initEditor();
}
+
</script>
<script type="text/javascript" src="$baseurl/js/ajaxupload.js"></script>
<script type="text/javascript">
@@ -121,6 +122,7 @@ function enableOnUser(){
var addtitle = '$addtitle';
$(document).ready(function() {
+
/* enable tinymce on focus and click */
$("#profile-jot-text").focus(enableOnUser);
$("#profile-jot-text").click(enableOnUser);
@@ -261,6 +263,18 @@ function enableOnUser(){
}
}
+ function itemFiler(id) {
+ reply = prompt("$fileas");
+ if(reply && reply.length) {
+ commentBusy = true;
+ $('body').css('cursor', 'wait');
+ $.get('filer/' + id + '?term=' + reply);
+ if(timer) clearTimeout(timer);
+ timer = setTimeout(NavUpdate,3000);
+ liking = 1;
+ }
+ }
+
function jotClearLocation() {
$('#jot-coord').val('');
$('#profile-nolocation-wrapper').hide();
diff --git a/view/theme/dispy-dark/nets.tpl b/view/theme/dispy-dark/nets.tpl
index b0cb8890c..b322717ad 100644
--- a/view/theme/dispy-dark/nets.tpl
+++ b/view/theme/dispy-dark/nets.tpl
@@ -4,7 +4,7 @@
<a href="$base" class="nets-link{{ if $sel_all }} nets-selected{{ endif }} nets-all">$all</a>
<ul class="nets-ul">
{{ for $nets as $net }}
- <li><a href="$base?nets=$net.ref" class="nets-link{{ if $net.selected }} nets-selected{{ endif }}">$net.name</a></li>
+ <li><a href="$base?f=&nets=$net.ref" class="nets-link{{ if $net.selected }} nets-selected{{ endif }}">$net.name</a></li>
{{ endfor }}
</ul>
</div>
diff --git a/view/theme/dispy-dark/profile_vcard.tpl b/view/theme/dispy-dark/profile_vcard.tpl
index 5cb567f5a..350a6ce4a 100644
--- a/view/theme/dispy-dark/profile_vcard.tpl
+++ b/view/theme/dispy-dark/profile_vcard.tpl
@@ -1,30 +1,44 @@
<div class="vcard">
+ {{ if $profile.edit }}
+ <div class="action">
+ <span class="icon-profile-edit"></span>
+ <a href="#" rel="#profiles-menu" class="ttright" id="profiles-menu-trigger" title="$profile.edit.3">$profile.edit.1</a>
+ <ul id="profiles-menu" class="menu-popup">
+ {{ for $profile.menu.entries as $e }}
+ <li>
+ <a href="profiles/$e.id"><img src='$e.photo'>$e.profile_name</a>
+ </li>
+ {{ endfor }}
+ <li><a href="profile_photo" >$profile.menu.chg_photo</a></li>
+ <li><a href="profiles/new" id="profile-listing-new-link">$profile.menu.cr_new</a></li>
+
+ </ul>
+ </div>
+ {{ endif }}
+
<div class="fn label">$profile.name</div>
-
+
{{ if $pdesc }}
<div class="title">$profile.pdesc</div>
{{ endif }}
<div id="profile-photo-wrapper">
- <img class="photo" width="175" height="175" src="$profile.photo" alt="$profile.name" />
- <div class="profile-edit-side-div">
- <a class="profile-edit-side-link icon edit" title="$profile.$editprofile" href="profiles/$profile.id" ></a>
- </div>
- <div class="clear"></div>
+ <img class="photo" width="175" height="175" src="$profile.photo?rev=$profile.picdate" alt="$profile.name" />
</div>
{{ if $location }}
<div class="location">
<span class="location-label">$location</span>
- <address class="adr">
+ <div class="adr">
{{ if $profile.address }}
<div class="street-address">$profile.address</div>{{ endif }}
- <span class="city-state-zip">$profile.zip</span>
- <span class="locality">$profile.locality</span>{{ if $profile.locality }}, {{ endif }}
- <span class="region">$profile.region</span>
- <span class="postal-code">$profile.postal-code</span>
+ <span class="city-state-zip">
+ <span class="locality">$profile.locality</span>{{ if $profile.locality }}, {{ endif }}
+ <span class="region">$profile.region</span>
+ <span class="postal-code">$profile.postal-code</span>
+ </span>
{{ if $profile.country-name }}<span class="country-name">$profile.country-name</span>{{ endif }}
- </address>
+ </div>
</div>
{{ endif }}
diff --git a/view/theme/dispy-dark/saved_searches_aside.tpl b/view/theme/dispy-dark/saved_searches_aside.tpl
index e2aae1e77..63a85dda5 100644
--- a/view/theme/dispy-dark/saved_searches_aside.tpl
+++ b/view/theme/dispy-dark/saved_searches_aside.tpl
@@ -1,4 +1,4 @@
-<div class="widget" id="saved-search-list">
+<div id="saved-search-list" class="widget">
<h3 id="search">$title</h3>
$searchbox
diff --git a/view/theme/dispy-dark/style.css b/view/theme/dispy-dark/style.css
index c590042f1..d1ec4efd7 100644
--- a/view/theme/dispy-dark/style.css
+++ b/view/theme/dispy-dark/style.css
@@ -195,14 +195,16 @@ input[type=submit] {
color: #fff;
}
+
/**
* global
*/
/* .tool .action */
.action {
- float: right;
+ margin: 5px 0;
}
+
/**
* login
*/
@@ -210,9 +212,10 @@ input[type=submit] {
margin-right: 20px;
}
-/*********
-* nav
-*********/
+
+/**
+ * nav
+ */
nav {
height: 60px;
display: block;
@@ -690,7 +693,9 @@ aside #viewcontacts {
#netsearch-box {
margin: 30px 0px;
}
-
+.ttright {
+ margin: 0px 0px 0px 0px;
+}
/**
* contacts block
@@ -830,6 +835,7 @@ aside #viewcontacts {
border: 0;
text-decoration: none;
float: right;
+ cursor: pointer;
}
#profile-jot-perms {
float: right;
@@ -916,7 +922,7 @@ aside #viewcontacts {
clear: both;
}
#jot-title-desc {
- color: #cccccc;
+ color: #ccc;
}
#profile-jot-desc {
color: #ff2000;
@@ -1097,7 +1103,7 @@ section {
clear: left;
font-size: 0.8em;
color: #878883;
- margin: 20px 0 0 110px;
+ margin: 20px 20px 0 110px;
}
.wall-item-ago {
display: inline;
@@ -1484,6 +1490,8 @@ div[id$="wrapper"] br {
}
#prvmail-subject {
width: 100%;
+ color: #2e2f2e;
+ background: #eec;
}
#prvmail-submit-wrapper {
margin-top: 10px;
@@ -1697,7 +1705,6 @@ div[id$="wrapper"] br {
}
-
/**
* register, settings & profile forms
*/
@@ -1744,26 +1751,44 @@ div[id$="wrapper"] br {
margin: 30px 0px;
}
.profile-edit-side-div {
- background: #2e2f2e;
- border-radius: 5px 5px 0 0;
- width: 175px;
- height: 20px;
- position: relative;
- margin: -25px -30px 0px 0px;
- display: none;
-}
-.profile-edit-side-div:hover {
+ /*background: #111;*/
+ /*border-radius: 5px 5px 0px 0px;*/
/*margin: 0px 0px 0px 0px;*/
- display: inline;
+ /*width: 100px;*/
+ /*height: 25px;*/
+ /*position: absolute;*/
+ display: none;
+ /*left: 35%;*/
+ /*top: 41%;*/
+ /*cursor: pointer;*/
}
-.profile-edit-side-link {
- margin: 0 0px 0px 155px;
- /*float: right;*/
+/*.profile-edit-side-div:hover {*/
+ /*display: block;*/
+/*}*/
+/*.profile-edit-side-link {*/
+ /*margin: 3px 0px 0px 70px;*/
+/*}*/
+#profiles-menu-trigger {
+ margin: 0px 0px 0px 25px;
}
.profile-listing {
float: left;
margin: 20px 20px 0px 0px;
}
+.icon-profile-edit {
+ background: url("icons.png") -150px 0px no-repeat;
+ border: 0;
+ cursor: pointer;
+ display: block;
+ float: right;
+ width: 20px;
+ height: 20px;
+ margin: 0 0 -18px;
+ position: absolute;
+ text-decoration: none;
+ top: 18px;
+ right: 226px;
+}
#profile-edit-links ul {
margin: 20px 0;
padding: 0;
@@ -1780,6 +1805,10 @@ div[id$="wrapper"] br {
background: #2e2f2e;
color: #eec;
}
+#id_ssl_policy {
+ width: 374px;
+}
+
/**
* contacts selector
diff --git a/view/theme/dispy-dark/theme.php b/view/theme/dispy-dark/theme.php
index 6f8243058..c0611ce83 100644
--- a/view/theme/dispy-dark/theme.php
+++ b/view/theme/dispy-dark/theme.php
@@ -74,16 +74,6 @@ $(document).ready(function() {
event.stopPropagation();
});
- // usermenu
- //$('html').click(function() {
-// $('#user-menu-popup').css('display: none');
- //document.getElementById("usermenu-popup").style.display = "none";
- //});
-
- //$('#user-menu').click(function(event) {
- // event.stopPropagation();
- //});
-
function toggleToolbar() {
if ( $('#nav-floater').is(':visible') ) {
$('#nav-floater').slideUp('fast');
@@ -106,11 +96,20 @@ $(document).ready(function() {
$(this).css({color: '#eec'});
});
- $('#profile-photo-wrapper').mouseover(function() {
- $('#profile-edit-side-div').css({display: 'block'});
+/* $('#profile-photo-wrapper').mouseover(function() {
+ $('.profile-edit-side-div').css({display: 'block'});
}).mouseout(function() {
- $('#profile-edit-side-div').css({display: 'none'});
+ $('.profile-edit-side-div').css({display: 'none'});
+ return false;
});
+
+ $('img.photo').mouseover(function() {
+ $('.profile-edit-side-div').css({display: 'block'});
+ }).mouseout(function() {
+ $('.profile-edit-side-div').css({display: 'none'});
+ return false;
+ });*/
+
});
</script>
EOT;
diff --git a/view/theme/dispy-dark/wall_item.tpl b/view/theme/dispy-dark/wall_item.tpl
index b013cfeef..c67a88635 100644
--- a/view/theme/dispy-dark/wall_item.tpl
+++ b/view/theme/dispy-dark/wall_item.tpl
@@ -26,11 +26,14 @@
<a href="#" id="starred-$item.id" onclick="dostar($item.id); return false;" class="star-item icon $item.isstarred" title="$item.star.toggle"></a>
<a href="#" id="tagger-$item.id" onclick="itemTag($item.id); return false;" class="tag-item icon tagged" title="$item.star.tagger"></a>
{{ endif }}
+
{{ if $item.vote }}
<div class="wall-item-like-buttons" id="wall-item-like-buttons-$item.id">
<a href="#" class="icon like" title="$item.vote.like.0" onclick="dolike($item.id,'like'); return false"></a>
<a href="#" class="icon dislike" title="$item.vote.dislike.0" onclick="dolike($item.id,'dislike'); return false"></a>
- {{ if $item.vote.share }}<a href="#" class="icon recycle wall-item-share-buttons" title="$item.vote.share.0" onclick="jotShare($item.id); return false"></a>{{ endif }}
+ {{ if $item.vote.share }}
+ <a href="#" id="share-$item.id"
+ class="icon recycle wall-item-share-buttons" title="$item.vote.share.0" onclick="jotShare($item.id); return false"></a>{{ endif }}
<img id="like-rotator-$item.id" class="like-rotator" src="images/rotator.gif" alt="$item.wait" title="$item.wait" style="display: none;" />
</div>
{{ endif }}
diff --git a/view/theme/dispy-dark/wallwall_item.tpl b/view/theme/dispy-dark/wallwall_item.tpl
index 86453fad2..f251d7352 100644
--- a/view/theme/dispy-dark/wallwall_item.tpl
+++ b/view/theme/dispy-dark/wallwall_item.tpl
@@ -31,11 +31,15 @@
<a href="#" id="starred-$item.id" onclick="dostar($item.id); return false;" class="star-item icon $item.isstarred" title="$item.star.toggle"></a>
<a href="#" id="tagger-$item.id" onclick="itemTag($item.id); return false;" class="tag-item icon tagged" title="$item.star.tagger"></a>
{{ endif }}
+
{{ if $item.vote }}
<div class="wall-item-like-buttons" id="wall-item-like-buttons-$item.id">
<a href="#" class="icon like" title="$item.vote.like.0" onclick="dolike($item.id,'like'); return false"></a>
<a href="#" class="icon dislike" title="$item.vote.dislike.0" onclick="dolike($item.id,'dislike'); return false"></a>
- {{ if $item.vote.share }}<a href="#" class="icon recycle wall-item-share-buttons" title="$item.vote.share.0" onclick="jotShare($item.id); return false"></a>{{ endif }}
+
+ {{ if $item.vote.share }}
+ <a href="#" id="share-$item.id"
+class="icon recycle wall-item-share-buttons" title="$item.vote.share.0" onclick="jotShare($item.id); return false"></a>{{ endif }}
<img id="like-rotator-$item.id" class="like-rotator" src="images/rotator.gif" alt="$item.wait" title="$item.wait" style="display: none;" />
</div>
{{ endif }}
@@ -63,6 +67,7 @@
{{ endfor }}
</div>
</div>
+
</div>
<div class="wall-item-author">
<a href="$item.profile_url" title="$item.linktitle" class="wall-item-name-link"><span class="wall-item-name$item.sparkle" id="wall-item-name-$item.id" >$item.name</span></a>
diff --git a/view/theme/dispy/theme.php b/view/theme/dispy/theme.php
index 75297290c..cbfcb09e6 100644
--- a/view/theme/dispy/theme.php
+++ b/view/theme/dispy/theme.php
@@ -111,6 +111,3 @@ $(document).ready(function() {
});
</script>
EOT;
-
-$a->page['footer'] .= <<<EOFooter
-EOFooter;
diff --git a/view/theme/duepuntozero/wall_item.tpl b/view/theme/duepuntozero/wall_item.tpl
index 6cb018b7b..e2db70a14 100755
--- a/view/theme/duepuntozero/wall_item.tpl
+++ b/view/theme/duepuntozero/wall_item.tpl
@@ -58,9 +58,8 @@
<a href="#" id="tagger-$item.id" onclick="itemTag($item.id); return false;" class="tag-item icon tagged" title="$item.star.tagger"></a>
{{ endif }}
{{ if $item.filer }}
- <a href="#" id="filer-$item.id" onclick="itemFiler($item.id); return false;" class="filer-item filer-icon" title="$item.filer"></a>
- {{ endif }}
-
+ <a href="#" id="filer-$item.id" onclick="itemFiler($item.id); return false;" class="filer-item filer-icon" title="$item.star.filer"></a>
+ {{ endif }}
<div class="wall-item-delete-wrapper" id="wall-item-delete-wrapper-$item.id" >
{{ if $item.drop.dropping }}<a href="item/drop/$item.id" onclick="return confirmDelete();" class="icon drophide" title="$item.drop.delete" onmouseover="imgbright(this);" onmouseout="imgdull(this);" ></a>{{ endif }}
</div>
diff --git a/view/theme/duepuntozero/wallwall_item.tpl b/view/theme/duepuntozero/wallwall_item.tpl
index c37bcb4a2..420c0e08b 100755
--- a/view/theme/duepuntozero/wallwall_item.tpl
+++ b/view/theme/duepuntozero/wallwall_item.tpl
@@ -62,8 +62,8 @@
<a href="#" id="tagger-$item.id" onclick="itemTag($item.id); return false;" class="tag-item icon tagged" title="$item.star.tagger"></a>
{{ endif }}
{{ if $item.filer }}
- <a href="#" id="filer-$item.id" onclick="itemFiler($item.id); return false;" class="filer-item filer-icon" title="$item.filer"></a>
- {{ endif }}
+ <a href="#" id="filer-$item.id" onclick="itemFiler($item.id); return false;" class="filer-item filer-icon" title="$item.star.filer"></a>
+ {{ endif }}
<div class="wall-item-delete-wrapper" id="wall-item-delete-wrapper-$item.id" >
{{ if $item.drop.dropping }}<a href="item/drop/$item.id" onclick="return confirmDelete();" class="icon drophide" title="$item.drop.delete" onmouseover="imgbright(this);" onmouseout="imgdull(this);" ></a>{{ endif }}