Merge branch 'master' of https://github.com/friendica/friendica
This commit is contained in:
commit
5bae7159cc
2
boot.php
2
boot.php
|
|
@ -9,7 +9,7 @@ require_once('include/nav.php');
|
|||
require_once('include/cache.php');
|
||||
|
||||
define ( 'FRIENDICA_PLATFORM', 'Friendica');
|
||||
define ( 'FRIENDICA_VERSION', '2.3.1278' );
|
||||
define ( 'FRIENDICA_VERSION', '2.3.1279' );
|
||||
define ( 'DFRN_PROTOCOL_VERSION', '2.22' );
|
||||
define ( 'DB_UPDATE_VERSION', 1131 );
|
||||
|
||||
|
|
|
|||
|
|
@ -1235,4 +1235,77 @@ function item_post_type($item) {
|
|||
return t('post');
|
||||
}
|
||||
|
||||
// post categories and "save to file" use the same item.file table for storage.
|
||||
// We will differentiate the different uses by wrapping categories in angle brackets
|
||||
// and save to file categories in square brackets.
|
||||
// To do this we need to escape these characters if they appear in our tag.
|
||||
|
||||
function file_tag_encode($s) {
|
||||
return str_replace(array('<','>','[',']'),array('%3c','%3e','%5b','%5d'),$s);
|
||||
}
|
||||
|
||||
function file_tag_decode($s) {
|
||||
return str_replace(array('%3c','%3e','%5b','%5d'),array('<','>','[',']'),$s);
|
||||
}
|
||||
|
||||
function file_tag_file_query($table,$s,$type = 'file') {
|
||||
if($type == 'file')
|
||||
$str = preg_quote( '[' . file_tag_encode($s) . ']' );
|
||||
else
|
||||
$str = preg_quote( '<' . file_tag_encode($s) . '>' );
|
||||
return " AND " . (($table) ? dbesc($table) . '.' : '') . "file regexp '" . dbesc($str) . "' ";
|
||||
}
|
||||
|
||||
function file_tag_save_file($uid,$item,$file) {
|
||||
$result = false;
|
||||
if(! intval($uid))
|
||||
return false;
|
||||
$r = q("select file from item where id = %d and uid = %d limit 1",
|
||||
intval($item),
|
||||
intval($uid)
|
||||
);
|
||||
if(count($r)) {
|
||||
if(! stristr($r[0]['file'],'[' . file_tag_encode($file) . ']'))
|
||||
q("update item set file = '%s' where id = %d and uid = %d limit 1",
|
||||
dbesc($r[0]['file'] . '[' . $file_tag_encode($file) . ']'),
|
||||
intval($item),
|
||||
intval($uid)
|
||||
);
|
||||
$saved = get_pconfig($uid,'system','filetags');
|
||||
if((! strlen($saved)) || (! stristr($saved,'[' . file_tag_encode($file) . ']')))
|
||||
set_pconfig($uid,'system','filetags',$saved . '[' . file_tag_encode($file) . ']');
|
||||
}
|
||||
return true;
|
||||
}
|
||||
|
||||
function file_tag_unsave_file($uid,$item,$file) {
|
||||
$result = false;
|
||||
if(! intval($uid))
|
||||
return false;
|
||||
|
||||
$pattern = '[' . file_tag_encode($file) . ']' ;
|
||||
|
||||
$r = q("select file from item where id = %d and uid = %d limit 1",
|
||||
intval($item),
|
||||
intval($uid)
|
||||
);
|
||||
if(! count($r))
|
||||
return false;
|
||||
|
||||
q("update item set file = '%s' where id = %d and uid = %d limit 1",
|
||||
dbesc(str_replace($pattern,'',$r[0]['file'])),
|
||||
intval($item),
|
||||
intval($uid)
|
||||
);
|
||||
|
||||
$r = q("select file from item where uid = %d " . file_tag_file_query('item',$file),
|
||||
intval($uid)
|
||||
);
|
||||
|
||||
if(! count($r)) {
|
||||
$saved = get_pconfig($uid,'system','filetags');
|
||||
set_pconfig($uid,'system','filetags',str_replace($pattern,'',$saved));
|
||||
}
|
||||
return true;
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -58,7 +58,9 @@ function saved_searches($search) {
|
|||
. ((x($_GET,'conv')) ? '&conv=' . $_GET['conv'] : '')
|
||||
. ((x($_GET,'nets')) ? '&nets=' . $_GET['nets'] : '')
|
||||
. ((x($_GET,'cmin')) ? '&cmin=' . $_GET['cmin'] : '')
|
||||
. ((x($_GET,'cmax')) ? '&cmax=' . $_GET['cmax'] : '');
|
||||
. ((x($_GET,'cmax')) ? '&cmax=' . $_GET['cmax'] : '')
|
||||
. ((x($_GET,'file')) ? '&file=' . $_GET['file'] : '');
|
||||
;
|
||||
|
||||
$o = '';
|
||||
|
||||
|
|
@ -226,6 +228,7 @@ function network_content(&$a, $update = 0) {
|
|||
$nets = ((x($_GET,'nets')) ? $_GET['nets'] : '');
|
||||
$cmin = ((x($_GET,'cmin')) ? intval($_GET['cmin']) : 0);
|
||||
$cmax = ((x($_GET,'cmax')) ? intval($_GET['cmax']) : 99);
|
||||
$file = ((x($_GET,'file')) ? $_GET['file'] : '');
|
||||
|
||||
if(($a->argc > 2) && $a->argv[2] === 'new')
|
||||
$nouveau = true;
|
||||
|
|
@ -239,7 +242,7 @@ function network_content(&$a, $update = 0) {
|
|||
}
|
||||
}
|
||||
|
||||
if(x($_GET,'search'))
|
||||
if(x($_GET,'search') || x($_GET,'file'))
|
||||
$nouveau = true;
|
||||
if($cid)
|
||||
$def_acl = array('allow_cid' => '<' . intval($cid) . '>');
|
||||
|
|
@ -358,6 +361,7 @@ function network_content(&$a, $update = 0) {
|
|||
. ((x($_GET,'nets')) ? '&nets=' . $_GET['nets'] : '')
|
||||
. ((x($_GET,'cmin')) ? '&cmin=' . $_GET['cmin'] : '')
|
||||
. ((x($_GET,'cmax')) ? '&cmax=' . $_GET['cmax'] : '')
|
||||
. ((x($_GET,'file')) ? '&file=' . $_GET['file'] : '')
|
||||
|
||||
. "'; var profile_page = " . $a->pager['page'] . "; </script>\r\n";
|
||||
}
|
||||
|
|
@ -371,6 +375,9 @@ function network_content(&$a, $update = 0) {
|
|||
dbesc('\\]' . preg_quote($search) . '\\[')
|
||||
);
|
||||
}
|
||||
if(strlen($file)) {
|
||||
$sql_extra .= file_tag_file_query('item',$file);
|
||||
}
|
||||
|
||||
if($conv) {
|
||||
$myurl = $a->get_baseurl() . '/profile/'. $a->user['nickname'];
|
||||
|
|
|
|||
|
|
@ -1,4 +1,22 @@
|
|||
<?php
|
||||
|
||||
/*
|
||||
* Name: Dark Bubble
|
||||
* Version: 1.0
|
||||
* Maintainer: Mike Macgirvin <mike@macgirvin.com>
|
||||
*/
|
||||
|
||||
|
||||
$a->theme_info = array(
|
||||
'extends' => 'testbubble',
|
||||
);
|
||||
|
||||
|
||||
$a->page['htmlhead'] .= <<< EOT
|
||||
<script>
|
||||
$(document).ready(function() {
|
||||
|
||||
$('html').click(function() { $("#nav-notifications-menu" ).hide(); });
|
||||
});
|
||||
</script>
|
||||
EOT;
|
||||
|
|
|
|||
|
|
@ -15,6 +15,8 @@ $a->page['htmlhead'] .= <<< EOT
|
|||
<script>
|
||||
$(document).ready(function() {
|
||||
|
||||
$('html').click(function() { $("#nav-notifications-menu" ).hide(); });
|
||||
|
||||
$('.group-edit-icon').hover(
|
||||
function() {
|
||||
$(this).addClass('icon'); $(this).removeClass('iconspacer');},
|
||||
|
|
|
|||
|
|
@ -16,6 +16,8 @@ $a->page['htmlhead'] .= <<< EOT
|
|||
<script>
|
||||
$(document).ready(function() {
|
||||
|
||||
$('html').click(function() { $("#nav-notifications-menu" ).hide(); });
|
||||
|
||||
$('.group-edit-icon').hover(
|
||||
function() {
|
||||
$(this).addClass('icon'); $(this).removeClass('iconspacer');},
|
||||
|
|
|
|||
29
view/theme/diabook-blue/group_side.tpl
Executable file
29
view/theme/diabook-blue/group_side.tpl
Executable file
|
|
@ -0,0 +1,29 @@
|
|||
<div id="group-sidebar" class="widget">
|
||||
<div class="title tool">
|
||||
<h3 class="label">$title</h3>
|
||||
<a href="group/new" title="$createtext" class="action"><span class="icon text s16 add"></span></a>
|
||||
</div>
|
||||
|
||||
<div id="sidebar-group-list">
|
||||
<ul>
|
||||
{{ for $groups as $group }}
|
||||
<li class="tool {{ if $group.selected }}selected{{ endif }}">
|
||||
<a href="$group.href" class="label">
|
||||
$group.text
|
||||
</a>
|
||||
{{ if $group.edit }}
|
||||
<a href="$group.edit.href" class="action"><span class="icon text s10 edit"></span></a>
|
||||
{{ endif }}
|
||||
{{ if $group.cid }}
|
||||
<input type="checkbox"
|
||||
class="{{ if $group.selected }}ticked{{ else }}unticked {{ endif }} action"
|
||||
onclick="contactgroupChangeMember('$group.id','$group.cid');return true;"
|
||||
{{ if $group.ismember }}checked="checked"{{ endif }}
|
||||
/>
|
||||
{{ endif }}
|
||||
</li>
|
||||
{{ endfor }}
|
||||
</ul>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
Binary file not shown.
|
Before Width: | Height: | Size: 1.2 KiB |
BIN
view/theme/diabook-blue/icons/next.png
Executable file
BIN
view/theme/diabook-blue/icons/next.png
Executable file
Binary file not shown.
|
After Width: | Height: | Size: 300 B |
BIN
view/theme/diabook-blue/icons/prev.png
Executable file
BIN
view/theme/diabook-blue/icons/prev.png
Executable file
Binary file not shown.
|
After Width: | Height: | Size: 336 B |
Binary file not shown.
|
Before Width: | Height: | Size: 798 B |
27
view/theme/diabook-blue/photo_view.tpl
Executable file
27
view/theme/diabook-blue/photo_view.tpl
Executable file
|
|
@ -0,0 +1,27 @@
|
|||
<div id="live-display"></div>
|
||||
<h3><a href="$album.0">$album.1</a></h3>
|
||||
|
||||
<div id="photo-edit-link-wrap">
|
||||
{{ if $tools }}
|
||||
<a id="photo-edit-link" href="$tools.edit.0">$tools.edit.1</a>
|
||||
-
|
||||
<a id="photo-toprofile-link" href="$tools.profile.0">$tools.profile.1</a>
|
||||
{{ endif }}
|
||||
{{ if $lock }} - <img src="images/lock_icon.gif" class="lockview" alt="$lock" onclick="lockview(event,'photo$id');" /> {{ endif }}
|
||||
</div>
|
||||
|
||||
<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>
|
||||
{{ if $nextlink }}<div id="photo-next-link"><a href="$nextlink.0">$nextlink.1</a></div>{{ endif }}
|
||||
</div>
|
||||
|
||||
<div id="photo-photo-end"></div>
|
||||
<div id="photo-caption" >$desc</div>
|
||||
{{ if $tags }}
|
||||
<div id="in-this-photo-text">$tags.0</div>
|
||||
<div id="in-this-photo">$tags.1</div>
|
||||
{{ endif }}
|
||||
{{ if $tags.2 }}<div id="tag-remove"><a href="$tags.2">$tags.3</a></div>{{ endif }}
|
||||
|
||||
{{ if $edit }}$edit{{ endif }}
|
||||
|
|
@ -247,7 +247,7 @@
|
|||
background-image: url("../../../images/icons/10/edit.png");
|
||||
}
|
||||
.icon.s10.star {
|
||||
background-image: url("../../../images/icons/10/star.png");
|
||||
background-image: url("../../../images/star_dummy.png");
|
||||
}
|
||||
.icon.s10.menu {
|
||||
background-image: url("../../../images/icons/10/menu.png");
|
||||
|
|
@ -285,7 +285,7 @@
|
|||
background-image: url("../../../images/icons/16/edit.png");
|
||||
}*/
|
||||
.icon.s16.star {
|
||||
background-image: url("../../../images/icons/16/star.png");
|
||||
background-image: url("../../../images/star_dummy.png");
|
||||
}
|
||||
.icon.s16.menu {
|
||||
background-image: url("../../../images/icons/16/menu.png");
|
||||
|
|
@ -323,7 +323,7 @@
|
|||
background-image: url("../../../images/icons/22/edit.png");
|
||||
}
|
||||
.icon.s22.star {
|
||||
background-image: url("../../../images/icons/22/star.png");
|
||||
background-image: url("../../../images/star_dummy.png");
|
||||
}
|
||||
.icon.s22.menu {
|
||||
background-image: url("../../../images/icons/22/menu.png");
|
||||
|
|
@ -361,7 +361,7 @@
|
|||
background-image: url("../../../images/icons/48/edit.png");
|
||||
}
|
||||
.icon.s48.star {
|
||||
background-image: url("../../../images/icons/48/star.png");
|
||||
background-image: url("../../../images/star_dummy.png");
|
||||
}
|
||||
.icon.s48.menu {
|
||||
background-image: url("../../../images/icons/48/menu.png");
|
||||
|
|
@ -438,7 +438,7 @@ a:hover {
|
|||
clear: both;
|
||||
}
|
||||
.fakelink {
|
||||
color: #3465A4;
|
||||
color: #1872A2;
|
||||
/* color: #3e3e8c; */
|
||||
text-decoration: none;
|
||||
cursor: pointer;
|
||||
|
|
@ -647,7 +647,7 @@ nav .nav-menu-icon {
|
|||
position: relative;
|
||||
height: 22px;
|
||||
padding: 5px;
|
||||
margin: 0px 7px;
|
||||
margin: 0px 5px;
|
||||
-moz-border-radius: 5px 5px 0 0;
|
||||
-webkit-border-radius: 5px 5px 0 0;
|
||||
border-radius: 5px 5px 0 0;
|
||||
|
|
@ -657,7 +657,7 @@ nav .nav-menu-icon:hover {
|
|||
position: relative;
|
||||
height: 22px;
|
||||
padding: 5px;
|
||||
margin: 0px 7px;
|
||||
margin: 0px 5px;
|
||||
-moz-border-radius: 5px 5px 0 0;
|
||||
-webkit-border-radius: 5px 5px 0 0;
|
||||
border-radius: 5px 5px 0 0;
|
||||
|
|
@ -716,21 +716,17 @@ nav #nav-user-linkmenu
|
|||
nav #nav-user-linkmenu{
|
||||
margin-right: 0px;
|
||||
}
|
||||
nav #nav-home-link{
|
||||
nav #nav-home-link, #nav-directory-link, #nav-apps-link{
|
||||
margin-left: 0px;
|
||||
margin-right: 0px;
|
||||
font-weight: bold;
|
||||
margin: 3px 5px;
|
||||
}
|
||||
nav #nav-directory-link{
|
||||
margin-left: 0px;
|
||||
margin-right: 0px;
|
||||
font-weight: bold;
|
||||
margin: 3px 15px;
|
||||
}
|
||||
nav #nav-apps-link{
|
||||
nav #nav-home-link{
|
||||
margin-left: 0px;
|
||||
margin-right: 0px;
|
||||
font-weight: bold;
|
||||
margin: 3px 15px;
|
||||
}
|
||||
nav #nav-help-link .menu-popup,
|
||||
nav #nav-search-link .menu-popup,
|
||||
|
|
@ -974,6 +970,10 @@ aside #side-peoplefind-url {
|
|||
widht: 55px;
|
||||
height: 55px;
|
||||
}
|
||||
#lost-password-link {
|
||||
float: left;
|
||||
margin-right: 20px;
|
||||
}
|
||||
/* widget */
|
||||
.widget {
|
||||
margin-bottom: 2em;
|
||||
|
|
@ -1048,6 +1048,12 @@ section {
|
|||
width: 800px;
|
||||
padding: 0px 0px 0px 12px;
|
||||
}
|
||||
body .pageheader{
|
||||
text-align: center;
|
||||
margin-top: 25px;
|
||||
font-size: 0px;
|
||||
}
|
||||
|
||||
#id_username {
|
||||
width: 173px;
|
||||
}
|
||||
|
|
@ -1063,7 +1069,8 @@ section {
|
|||
padding: 10px;
|
||||
text-align: center;
|
||||
font-size: 1.0em;
|
||||
margin-top: 140%;
|
||||
clear: both;
|
||||
display: block;
|
||||
}
|
||||
|
||||
.tabs {
|
||||
|
|
@ -1306,14 +1313,14 @@ section {
|
|||
}
|
||||
.tag {
|
||||
/*background: url("../../../images/tag_b.png") repeat-x center left;*/
|
||||
color: #3465A4;
|
||||
color: #999;
|
||||
padding-left: 3px;
|
||||
font-size: 12px;
|
||||
}
|
||||
.tag a {
|
||||
padding-right: 5px;
|
||||
/*background: url("../../../images/tag.png") no-repeat center right;*/
|
||||
color: #3465A4;
|
||||
color: #999;
|
||||
}
|
||||
.wwto {
|
||||
position: absolute !important;
|
||||
|
|
@ -1616,7 +1623,7 @@ section {
|
|||
box-shadow: 0 1px 1px #CFCFCF;
|
||||
}
|
||||
.button.creation2 {
|
||||
background-color: #33ACFF;
|
||||
background-color: #1872A2;
|
||||
background-image: -moz-linear-gradient(center top , #66C1FF 0%, #0097FF 100%);
|
||||
border: 1px solid #777777;
|
||||
color: white;
|
||||
|
|
@ -1988,10 +1995,24 @@ box-shadow: 1px 1px 5px 0;
|
|||
}
|
||||
|
||||
#prvmail-submit {
|
||||
float: left;
|
||||
float: right;
|
||||
margin-top: 10px;
|
||||
margin-right: 30px;
|
||||
}
|
||||
|
||||
#prvmail-subject
|
||||
{
|
||||
background: none repeat scroll 0 0 #FFFFFF;
|
||||
border: 1px solid #CCCCCC;
|
||||
border-radius: 5px 5px 5px 5px;
|
||||
font-weight: bold;
|
||||
height: 20px;
|
||||
margin: 0 0 5px;
|
||||
vertical-align: middle;
|
||||
}
|
||||
#prvmail-form{
|
||||
width: 597px;
|
||||
}
|
||||
|
||||
#prvmail-upload-wrapper,
|
||||
#prvmail-link-wrapper,
|
||||
#prvmail-rotator-wrapper {
|
||||
|
|
@ -2179,7 +2200,9 @@ a.mail-list-link {
|
|||
padding: 10px;
|
||||
float: left;
|
||||
}
|
||||
|
||||
.lightbox{
|
||||
float: left;
|
||||
}
|
||||
#photo-photo {
|
||||
float: left;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -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:
|
||||
*/
|
||||
|
|
@ -12,7 +12,9 @@ $a->theme_info = array(
|
|||
);
|
||||
|
||||
$a->page['htmlhead'] .= <<< EOT
|
||||
|
||||
<script>
|
||||
|
||||
//contacts
|
||||
$('html').click(function() {
|
||||
$('#nav-contacts-linkmenu').removeClass('selected');
|
||||
|
|
@ -62,5 +64,20 @@ $('html').click(function() {
|
|||
$('#nav-site-linkmenu').click(function(event){
|
||||
event.stopPropagation();
|
||||
});
|
||||
//appsmenu
|
||||
$('html').click(function() {
|
||||
$('#nav-apps-link').removeClass('selected');
|
||||
document.getElementById( "nav-apps-menu" ).style.display = "none";
|
||||
});
|
||||
|
||||
$('#nav-apps-link').click(function(event){
|
||||
event.stopPropagation();
|
||||
});
|
||||
|
||||
$(function() {
|
||||
$('a.lightbox').fancybox(); // Select all links with lightbox class
|
||||
});
|
||||
|
||||
|
||||
</script>
|
||||
EOT;
|
||||
|
|
|
|||
29
view/theme/diabook/group_side.tpl
Executable file
29
view/theme/diabook/group_side.tpl
Executable file
|
|
@ -0,0 +1,29 @@
|
|||
<div id="group-sidebar" class="widget">
|
||||
<div class="title tool">
|
||||
<h3 class="label">$title</h3>
|
||||
<a href="group/new" title="$createtext" class="action"><span class="icon text s16 add"></span></a>
|
||||
</div>
|
||||
|
||||
<div id="sidebar-group-list">
|
||||
<ul>
|
||||
{{ for $groups as $group }}
|
||||
<li class="tool {{ if $group.selected }}selected{{ endif }}">
|
||||
<a href="$group.href" class="label">
|
||||
$group.text
|
||||
</a>
|
||||
{{ if $group.edit }}
|
||||
<a href="$group.edit.href" class="action"><span class="icon text s10 edit"></span></a>
|
||||
{{ endif }}
|
||||
{{ if $group.cid }}
|
||||
<input type="checkbox"
|
||||
class="{{ if $group.selected }}ticked{{ else }}unticked {{ endif }} action"
|
||||
onclick="contactgroupChangeMember('$group.id','$group.cid');return true;"
|
||||
{{ if $group.ismember }}checked="checked"{{ endif }}
|
||||
/>
|
||||
{{ endif }}
|
||||
</li>
|
||||
{{ endfor }}
|
||||
</ul>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
Binary file not shown.
|
Before Width: | Height: | Size: 1.2 KiB |
BIN
view/theme/diabook/icons/next.png
Executable file
BIN
view/theme/diabook/icons/next.png
Executable file
Binary file not shown.
|
After Width: | Height: | Size: 300 B |
BIN
view/theme/diabook/icons/prev.png
Executable file
BIN
view/theme/diabook/icons/prev.png
Executable file
Binary file not shown.
|
After Width: | Height: | Size: 336 B |
Binary file not shown.
|
Before Width: | Height: | Size: 798 B |
27
view/theme/diabook/photo_view.tpl
Executable file
27
view/theme/diabook/photo_view.tpl
Executable file
|
|
@ -0,0 +1,27 @@
|
|||
<div id="live-display"></div>
|
||||
<h3><a href="$album.0">$album.1</a></h3>
|
||||
|
||||
<div id="photo-edit-link-wrap">
|
||||
{{ if $tools }}
|
||||
<a id="photo-edit-link" href="$tools.edit.0">$tools.edit.1</a>
|
||||
-
|
||||
<a id="photo-toprofile-link" href="$tools.profile.0">$tools.profile.1</a>
|
||||
{{ endif }}
|
||||
{{ if $lock }} - <img src="images/lock_icon.gif" class="lockview" alt="$lock" onclick="lockview(event,'photo$id');" /> {{ endif }}
|
||||
</div>
|
||||
|
||||
<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>
|
||||
{{ if $nextlink }}<div id="photo-next-link"><a href="$nextlink.0">$nextlink.1</a></div>{{ endif }}
|
||||
</div>
|
||||
|
||||
<div id="photo-photo-end"></div>
|
||||
<div id="photo-caption" >$desc</div>
|
||||
{{ if $tags }}
|
||||
<div id="in-this-photo-text">$tags.0</div>
|
||||
<div id="in-this-photo">$tags.1</div>
|
||||
{{ endif }}
|
||||
{{ if $tags.2 }}<div id="tag-remove"><a href="$tags.2">$tags.3</a></div>{{ endif }}
|
||||
|
||||
{{ if $edit }}$edit{{ endif }}
|
||||
|
|
@ -177,8 +177,8 @@
|
|||
|
||||
.icon.on { background-image: url("../../../view/theme/diabook/icons/toogle_on.png"); background-repeat: no-repeat;}
|
||||
.icon.off { background-image: url("../../../view/theme/diabook/icons/toogle_off.png"); background-repeat: no-repeat;}
|
||||
.prev { background-position: -90px -60px;}
|
||||
.next { background-position: -110px -60px;}
|
||||
.icon.prev { background-image: url("../../../view/theme/diabook/icons/prev.png"); background-repeat: no-repeat;}
|
||||
.icon.next { background-image: url("../../../view/theme/diabook/icons/next.png"); background-repeat: no-repeat;}
|
||||
/*.tagged { background-position: -130px -60px;}*/
|
||||
|
||||
.attachtype {
|
||||
|
|
@ -247,7 +247,7 @@
|
|||
background-image: url("../../../images/icons/10/edit.png");
|
||||
}
|
||||
.icon.s10.star {
|
||||
background-image: url("../../../images/icons/10/star.png");
|
||||
background-image: url("../../../images/star_dummy.png");
|
||||
}
|
||||
.icon.s10.menu {
|
||||
background-image: url("../../../images/icons/10/menu.png");
|
||||
|
|
@ -285,7 +285,7 @@
|
|||
background-image: url("../../../images/icons/16/edit.png");
|
||||
}*/
|
||||
.icon.s16.star {
|
||||
background-image: url("../../../images/icons/16/star.png");
|
||||
background-image: url("../../../images/star_dummy.png");
|
||||
}
|
||||
.icon.s16.menu {
|
||||
background-image: url("../../../images/icons/16/menu.png");
|
||||
|
|
@ -323,7 +323,7 @@
|
|||
background-image: url("../../../images/icons/22/edit.png");
|
||||
}
|
||||
.icon.s22.star {
|
||||
background-image: url("../../../images/icons/22/star.png");
|
||||
background-image: url("../../../images/star_dummy.png");
|
||||
}
|
||||
.icon.s22.menu {
|
||||
background-image: url("../../../images/icons/22/menu.png");
|
||||
|
|
@ -361,7 +361,7 @@
|
|||
background-image: url("../../../images/icons/48/edit.png");
|
||||
}
|
||||
.icon.s48.star {
|
||||
background-image: url("../../../images/icons/48/star.png");
|
||||
background-image: url("../../../images/star_dummy.png");
|
||||
}
|
||||
.icon.s48.menu {
|
||||
background-image: url("../../../images/icons/48/menu.png");
|
||||
|
|
@ -400,6 +400,7 @@ body {
|
|||
margin: 50px auto auto;
|
||||
display: table;
|
||||
}
|
||||
|
||||
h4 {
|
||||
font-size: 1.1em;
|
||||
}
|
||||
|
|
@ -704,21 +705,17 @@ nav #nav-user-linkmenu
|
|||
nav #nav-user-linkmenu{
|
||||
margin-right: 0px;
|
||||
}
|
||||
nav #nav-home-link{
|
||||
nav #nav-home-link, #nav-directory-link, #nav-apps-link{
|
||||
margin-left: 0px;
|
||||
margin-right: 0px;
|
||||
font-weight: bold;
|
||||
margin: 3px 5px;
|
||||
}
|
||||
nav #nav-directory-link{
|
||||
margin-left: 0px;
|
||||
margin-right: 0px;
|
||||
font-weight: bold;
|
||||
margin: 3px 15px;
|
||||
}
|
||||
nav #nav-apps-link{
|
||||
nav #nav-home-link{
|
||||
margin-left: 0px;
|
||||
margin-right: 0px;
|
||||
font-weight: bold;
|
||||
margin: 3px 15px;
|
||||
}
|
||||
nav #nav-help-link .menu-popup,
|
||||
nav #nav-search-link .menu-popup,
|
||||
|
|
@ -866,6 +863,8 @@ ul.menu-popup .empty {
|
|||
padding: 7px 7px 0px 0px;
|
||||
}
|
||||
|
||||
|
||||
|
||||
/* aside */
|
||||
aside {
|
||||
display: table-cell;
|
||||
|
|
@ -876,6 +875,7 @@ aside {
|
|||
float: left;
|
||||
/* background: #F1F1F1; */
|
||||
}
|
||||
|
||||
aside .vcard .fn {
|
||||
font-size: 18px;
|
||||
font-weight: bold;
|
||||
|
|
@ -962,6 +962,10 @@ aside #side-peoplefind-url {
|
|||
widht: 55px;
|
||||
height: 55px;
|
||||
}
|
||||
#lost-password-link {
|
||||
float: left;
|
||||
margin-right: 20px;
|
||||
}
|
||||
/* widget */
|
||||
.widget {
|
||||
margin-bottom: 2em;
|
||||
|
|
@ -1036,6 +1040,13 @@ section {
|
|||
width: 800px;
|
||||
padding: 0px 0px 0px 12px;
|
||||
}
|
||||
|
||||
body .pageheader{
|
||||
text-align: center;
|
||||
margin-top: 25px;
|
||||
font-size: 0px;
|
||||
}
|
||||
|
||||
#id_username {
|
||||
width: 173px;
|
||||
}
|
||||
|
|
@ -1046,13 +1057,13 @@ section {
|
|||
width: 173px;
|
||||
}
|
||||
#contact-edit-end {
|
||||
|
||||
}
|
||||
.pager {
|
||||
padding: 10px;
|
||||
text-align: center;
|
||||
font-size: 1.0em;
|
||||
margin-top: 140%;
|
||||
clear: both;
|
||||
display: block;
|
||||
}
|
||||
.tabs {
|
||||
|
||||
|
|
@ -1972,9 +1983,21 @@ box-shadow: 1px 1px 5px 0;
|
|||
}
|
||||
|
||||
#prvmail-submit {
|
||||
float: left;
|
||||
float: right;
|
||||
margin-top: 10px;
|
||||
margin-right: 30px;
|
||||
}
|
||||
#prvmail-subject
|
||||
{
|
||||
background: none repeat scroll 0 0 #FFFFFF;
|
||||
border: 1px solid #CCCCCC;
|
||||
border-radius: 5px 5px 5px 5px;
|
||||
font-weight: bold;
|
||||
height: 20px;
|
||||
margin: 0 0 5px;
|
||||
vertical-align: middle;
|
||||
}
|
||||
#prvmail-form{
|
||||
width: 597px;
|
||||
}
|
||||
#prvmail-upload-wrapper,
|
||||
#prvmail-link-wrapper,
|
||||
|
|
@ -2163,13 +2186,24 @@ a.mail-list-link {
|
|||
padding: 10px;
|
||||
float: left;
|
||||
}
|
||||
.lightbox{
|
||||
float: left;
|
||||
}
|
||||
|
||||
#photo-photo {
|
||||
float: left;
|
||||
}
|
||||
#photo-like-div .wall-item-like-buttons {
|
||||
float: left;
|
||||
margin-right: 10px;
|
||||
margin-right: 5px;
|
||||
margin-top: 30px;
|
||||
}
|
||||
.comment-edit-text-empty {
|
||||
margin: 10px 0 0;
|
||||
width: 85%;
|
||||
}
|
||||
.comment-edit-photo {
|
||||
margin: 10px 0 0;
|
||||
}
|
||||
.wall-item-like-buttons .icon.like {
|
||||
float: left;
|
||||
|
|
|
|||
|
|
@ -12,6 +12,7 @@ $a->theme_info = array(
|
|||
);
|
||||
|
||||
$a->page['htmlhead'] .= <<< EOT
|
||||
|
||||
<script>
|
||||
|
||||
//contacts
|
||||
|
|
@ -63,5 +64,20 @@ $('html').click(function() {
|
|||
$('#nav-site-linkmenu').click(function(event){
|
||||
event.stopPropagation();
|
||||
});
|
||||
//appsmenu
|
||||
$('html').click(function() {
|
||||
$('#nav-apps-link').removeClass('selected');
|
||||
document.getElementById( "nav-apps-menu" ).style.display = "none";
|
||||
});
|
||||
|
||||
$('#nav-apps-link').click(function(event){
|
||||
event.stopPropagation();
|
||||
});
|
||||
|
||||
$(function() {
|
||||
$('a.lightbox').fancybox(); // Select all links with lightbox class
|
||||
});
|
||||
|
||||
|
||||
</script>
|
||||
EOT;
|
||||
|
|
|
|||
|
|
@ -5,6 +5,8 @@ $a->page['htmlhead'] .= <<< EOT
|
|||
<script>
|
||||
$(document).ready(function() {
|
||||
|
||||
$('html').click(function() { $("#nav-notifications-menu" ).hide(); });
|
||||
|
||||
$('.group-edit-icon').hover(
|
||||
function() {
|
||||
$(this).addClass('icon'); $(this).removeClass('iconspacer');},
|
||||
|
|
|
|||
|
|
@ -7,6 +7,8 @@ $a->page['htmlhead'] .= <<< EOT
|
|||
<script>
|
||||
$(document).ready(function() {
|
||||
|
||||
$('html').click(function() { $("#nav-notifications-menu" ).hide(); });
|
||||
|
||||
$('.group-edit-icon').hover(
|
||||
function() {
|
||||
$(this).addClass('icon'); $(this).removeClass('iconspacer');},
|
||||
|
|
|
|||
|
|
@ -7,6 +7,8 @@ $a->page['htmlhead'] .= <<< EOT
|
|||
<script>
|
||||
$(document).ready(function() {
|
||||
|
||||
$('html').click(function() { $("#nav-notifications-menu" ).hide(); });
|
||||
|
||||
$('.group-edit-icon').hover(
|
||||
function() {
|
||||
$(this).addClass('icon'); $(this).removeClass('iconspacer');},
|
||||
|
|
|
|||
|
|
@ -7,6 +7,8 @@ $a->page['htmlhead'] .= <<< EOT
|
|||
<script>
|
||||
$(document).ready(function() {
|
||||
|
||||
$('html').click(function() { $("#nav-notifications-menu" ).hide(); });
|
||||
|
||||
$('.group-edit-icon').hover(
|
||||
function() {
|
||||
$(this).addClass('icon'); $(this).removeClass('iconspacer');},
|
||||
|
|
|
|||
|
|
@ -7,3 +7,12 @@
|
|||
* Author: Devlon Duthied
|
||||
* Maintainer: Mike Macgirvin <mike@macgirvin.com>
|
||||
*/
|
||||
|
||||
$a->page['htmlhead'] .= <<< EOT
|
||||
<script>
|
||||
$(document).ready(function() {
|
||||
|
||||
$('html').click(function() { $("#nav-notifications-menu" ).hide(); });
|
||||
});
|
||||
</script>
|
||||
EOT;
|
||||
|
|
|
|||
Loading…
Reference in a new issue