aboutsummaryrefslogtreecommitdiffstats
path: root/view
diff options
context:
space:
mode:
authorfriendica <info@friendica.com>2012-03-12 19:12:39 -0700
committerfriendica <info@friendica.com>2012-03-12 19:12:39 -0700
commite12706e825a65f1c7da1d0eee7a346dbdd2c34a3 (patch)
tree99fb2e26298b1dcc0b436b00b279f4e71a2dcbeb /view
parentacf75e85c86a2e47549ee74d60c7d82dcc5c8cc4 (diff)
parent691f5b11f70b35537482c0a647ed571475caedd8 (diff)
downloadvolse-hubzilla-e12706e825a65f1c7da1d0eee7a346dbdd2c34a3.tar.gz
volse-hubzilla-e12706e825a65f1c7da1d0eee7a346dbdd2c34a3.tar.bz2
volse-hubzilla-e12706e825a65f1c7da1d0eee7a346dbdd2c34a3.zip
Merge branch 'pull'
Diffstat (limited to 'view')
-rwxr-xr-xview/theme/diabook-blue/experimental0
-rwxr-xr-xview/theme/diabook-blue/group_side.tpl29
-rw-r--r--view/theme/diabook-blue/icons/isstar.pngbin1277 -> 0 bytes
-rwxr-xr-xview/theme/diabook-blue/icons/next.pngbin0 -> 300 bytes
-rwxr-xr-xview/theme/diabook-blue/icons/prev.pngbin0 -> 336 bytes
-rwxr-xr-xview/theme/diabook-blue/icons/unglobe.pngbin798 -> 0 bytes
-rwxr-xr-xview/theme/diabook-blue/photo_view.tpl27
-rw-r--r--view/theme/diabook-blue/style.css71
-rwxr-xr-xview/theme/diabook-blue/theme.php23
-rwxr-xr-xview/theme/diabook/experimental0
-rwxr-xr-xview/theme/diabook/group_side.tpl29
-rw-r--r--view/theme/diabook/icons/isstar.pngbin1277 -> 0 bytes
-rwxr-xr-xview/theme/diabook/icons/next.pngbin0 -> 300 bytes
-rwxr-xr-xview/theme/diabook/icons/prev.pngbin0 -> 336 bytes
-rwxr-xr-xview/theme/diabook/icons/unglobe.pngbin798 -> 0 bytes
-rwxr-xr-xview/theme/diabook/photo_view.tpl27
-rw-r--r--view/theme/diabook/style.css78
-rwxr-xr-xview/theme/diabook/theme.php18
18 files changed, 252 insertions, 50 deletions
diff --git a/view/theme/diabook-blue/experimental b/view/theme/diabook-blue/experimental
deleted file mode 100755
index e69de29bb..000000000
--- a/view/theme/diabook-blue/experimental
+++ /dev/null
diff --git a/view/theme/diabook-blue/group_side.tpl b/view/theme/diabook-blue/group_side.tpl
new file mode 100755
index 000000000..af183d04d
--- /dev/null
+++ b/view/theme/diabook-blue/group_side.tpl
@@ -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>
+
diff --git a/view/theme/diabook-blue/icons/isstar.png b/view/theme/diabook-blue/icons/isstar.png
deleted file mode 100644
index c955b25b5..000000000
--- a/view/theme/diabook-blue/icons/isstar.png
+++ /dev/null
Binary files differ
diff --git a/view/theme/diabook-blue/icons/next.png b/view/theme/diabook-blue/icons/next.png
new file mode 100755
index 000000000..7b5e25b90
--- /dev/null
+++ b/view/theme/diabook-blue/icons/next.png
Binary files differ
diff --git a/view/theme/diabook-blue/icons/prev.png b/view/theme/diabook-blue/icons/prev.png
new file mode 100755
index 000000000..55c1464ba
--- /dev/null
+++ b/view/theme/diabook-blue/icons/prev.png
Binary files differ
diff --git a/view/theme/diabook-blue/icons/unglobe.png b/view/theme/diabook-blue/icons/unglobe.png
deleted file mode 100755
index aa9b0e189..000000000
--- a/view/theme/diabook-blue/icons/unglobe.png
+++ /dev/null
Binary files differ
diff --git a/view/theme/diabook-blue/photo_view.tpl b/view/theme/diabook-blue/photo_view.tpl
new file mode 100755
index 000000000..511fc73ac
--- /dev/null
+++ b/view/theme/diabook-blue/photo_view.tpl
@@ -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 }} \ No newline at end of file
diff --git a/view/theme/diabook-blue/style.css b/view/theme/diabook-blue/style.css
index 51b173f2a..93307153f 100644
--- a/view/theme/diabook-blue/style.css
+++ b/view/theme/diabook-blue/style.css
@@ -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;
+ 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,
@@ -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;
}
diff --git a/view/theme/diabook-blue/theme.php b/view/theme/diabook-blue/theme.php
index 0a20c9fbc..e5aa710c7 100755
--- a/view/theme/diabook-blue/theme.php
+++ b/view/theme/diabook-blue/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:
*/
@@ -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();
});
-</script>
+ //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;
diff --git a/view/theme/diabook/experimental b/view/theme/diabook/experimental
deleted file mode 100755
index e69de29bb..000000000
--- a/view/theme/diabook/experimental
+++ /dev/null
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 @@
+<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>
+
diff --git a/view/theme/diabook/icons/isstar.png b/view/theme/diabook/icons/isstar.png
deleted file mode 100644
index c955b25b5..000000000
--- a/view/theme/diabook/icons/isstar.png
+++ /dev/null
Binary files differ
diff --git a/view/theme/diabook/icons/next.png b/view/theme/diabook/icons/next.png
new file mode 100755
index 000000000..7b5e25b90
--- /dev/null
+++ b/view/theme/diabook/icons/next.png
Binary files differ
diff --git a/view/theme/diabook/icons/prev.png b/view/theme/diabook/icons/prev.png
new file mode 100755
index 000000000..55c1464ba
--- /dev/null
+++ b/view/theme/diabook/icons/prev.png
Binary files differ
diff --git a/view/theme/diabook/icons/unglobe.png b/view/theme/diabook/icons/unglobe.png
deleted file mode 100755
index aa9b0e189..000000000
--- a/view/theme/diabook/icons/unglobe.png
+++ /dev/null
Binary files 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 @@
+<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 }} \ 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
+
<script>
//contacts
@@ -63,5 +64,20 @@ $('html').click(function() {
$('#nav-site-linkmenu').click(function(event){
event.stopPropagation();
});
-</script>
+ //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;