diff --git a/boot.php b/boot.php
index 0fafa1cf3..93c667dc9 100755
--- a/boot.php
+++ b/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 );
diff --git a/include/text.php b/include/text.php
index 011006b76..2663bdeba 100644
--- a/include/text.php
+++ b/include/text.php
@@ -913,6 +913,33 @@ function prepare_body($item,$attach = false) {
}
$s .= '
';
}
+ $matches = false;
+ $cnt = preg_match_all('/<(.*?)>/',$item['file'],$matches,PREG_SET_ORDER);
+ if($cnt) {
+ logger('prepare_text: categories: ' . print_r($matches,true), LOGGER_DEBUG);
+ foreach($matches as $mtch) {
+ if(strlen($x))
+ $x .= ',';
+ $x .= file_tag_decode($mtch[1]);
+ }
+ if(strlen($x))
+ $s .= '' . t('Categories:') . ' ' . $x . '
';
+
+
+ }
+ $matches = false;
+ $x = '';
+ $cnt = preg_match_all('/\[(.*?)\]/',$item['file'],$matches,PREG_SET_ORDER);
+ if($cnt) {
+ logger('prepare_text: filed_under: ' . print_r($matches,true), LOGGER_DEBUG);
+ foreach($matches as $mtch) {
+ if(strlen($x))
+ $x .= ',';
+ $x .= file_tag_decode($mtch[1]);
+ }
+ if(strlen($x) && (local_user() == $item['uid']))
+ $s .= '' . t('Filed under:') . ' ' . $x . '
';
+ }
$prep_arr = array('item' => $item, 'html' => $s);
diff --git a/view/theme/darkbubble/theme.php b/view/theme/darkbubble/theme.php
index 326c98bbd..053730c21 100755
--- a/view/theme/darkbubble/theme.php
+++ b/view/theme/darkbubble/theme.php
@@ -1,4 +1,22 @@
+ */
+
+
$a->theme_info = array(
'extends' => 'testbubble',
);
+
+
+$a->page['htmlhead'] .= <<< EOT
+
+EOT;
diff --git a/view/theme/darkzero-NS/theme.php b/view/theme/darkzero-NS/theme.php
index 521b1859e..2d3e4fd56 100755
--- a/view/theme/darkzero-NS/theme.php
+++ b/view/theme/darkzero-NS/theme.php
@@ -15,6 +15,8 @@ $a->page['htmlhead'] .= <<< EOT
+ //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
+});
+
+
+
EOT;
diff --git a/view/theme/diabook/experimental b/view/theme/diabook/experimental
deleted file mode 100755
index e69de29bb..000000000
diff --git a/view/theme/diabook/group_side.tpl b/view/theme/diabook/group_side.tpl
new file mode 100755
index 000000000..af183d04d
--- /dev/null
+++ b/view/theme/diabook/group_side.tpl
@@ -0,0 +1,29 @@
+
+
diff --git a/view/theme/diabook/icons/isstar.png b/view/theme/diabook/icons/isstar.png
deleted file mode 100644
index c955b25b5..000000000
Binary files a/view/theme/diabook/icons/isstar.png and /dev/null differ
diff --git a/view/theme/diabook/icons/next.png b/view/theme/diabook/icons/next.png
new file mode 100755
index 000000000..7b5e25b90
Binary files /dev/null and b/view/theme/diabook/icons/next.png differ
diff --git a/view/theme/diabook/icons/prev.png b/view/theme/diabook/icons/prev.png
new file mode 100755
index 000000000..55c1464ba
Binary files /dev/null and b/view/theme/diabook/icons/prev.png differ
diff --git a/view/theme/diabook/icons/unglobe.png b/view/theme/diabook/icons/unglobe.png
deleted file mode 100755
index aa9b0e189..000000000
Binary files a/view/theme/diabook/icons/unglobe.png and /dev/null differ
diff --git a/view/theme/diabook/photo_view.tpl b/view/theme/diabook/photo_view.tpl
new file mode 100755
index 000000000..511fc73ac
--- /dev/null
+++ b/view/theme/diabook/photo_view.tpl
@@ -0,0 +1,27 @@
+
+
+
+
+
+
+ {{ if $prevlink }}
{{ endif }}
+
![]($photo.src)
+ {{ if $nextlink }}
{{ endif }}
+
+
+
+$desc
+{{ if $tags }}
+$tags.0
+$tags.1
+{{ endif }}
+{{ if $tags.2 }}{{ endif }}
+
+{{ if $edit }}$edit{{ endif }}
\ No newline at end of file
diff --git a/view/theme/diabook/style.css b/view/theme/diabook/style.css
index ad7119c2a..9edd989b0 100644
--- a/view/theme/diabook/style.css
+++ b/view/theme/diabook/style.css
@@ -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;
+ margin-right: 0px;
}
-nav #nav-apps-link{
- margin-left: 0px;
- margin-right: 0px;
- font-weight: bold;
- margin: 3px 15px;
+nav #nav-home-link{
+ margin-left: 0px;
}
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,10 +1983,22 @@ 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 {
@@ -2163,14 +2186,25 @@ 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;
+ float: left;
+ 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;
}
diff --git a/view/theme/diabook/theme.php b/view/theme/diabook/theme.php
index 5a1828ad7..5d3c2906d 100755
--- a/view/theme/diabook/theme.php
+++ b/view/theme/diabook/theme.php
@@ -12,6 +12,7 @@ $a->theme_info = array(
);
$a->page['htmlhead'] .= <<< EOT
+
+ //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
+});
+
+
+
EOT;
diff --git a/view/theme/duepuntozero/theme.php b/view/theme/duepuntozero/theme.php
index 7d919fedc..701fb1349 100755
--- a/view/theme/duepuntozero/theme.php
+++ b/view/theme/duepuntozero/theme.php
@@ -5,6 +5,8 @@ $a->page['htmlhead'] .= <<< EOT
+EOT;