aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authortomtom84 <63dc41d76451@ba77e90e49a6.anonbox.net>2012-03-12 15:33:29 -0700
committertomtom84 <63dc41d76451@ba77e90e49a6.anonbox.net>2012-03-12 15:33:29 -0700
commit8a85914e1d46bb97da7571f1d3fdd377594320f9 (patch)
treec89f4c9c9437f2e947f4f462b1b00037d32d5df7
parenta1305433b8110ebfa9d722ba4053f0292dadf22a (diff)
parentcaffb217c1e7227137ac1575af369b34d10519fe (diff)
downloadvolse-hubzilla-8a85914e1d46bb97da7571f1d3fdd377594320f9.tar.gz
volse-hubzilla-8a85914e1d46bb97da7571f1d3fdd377594320f9.tar.bz2
volse-hubzilla-8a85914e1d46bb97da7571f1d3fdd377594320f9.zip
Merge pull request #126 from tomtom84/master
fixes in diabook-derivates
-rwxr-xr-xview/theme/diabook-blue/group_side.tpl29
-rwxr-xr-xview/theme/diabook-blue/icons/notifications.pngbin795 -> 727 bytes
-rw-r--r--view/theme/diabook-blue/style.css7
-rwxr-xr-xview/theme/diabook-blue/theme.php4
-rwxr-xr-xview/theme/diabook/group_side.tpl29
-rw-r--r--view/theme/diabook/style.css7
6 files changed, 72 insertions, 4 deletions
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/notifications.png b/view/theme/diabook-blue/icons/notifications.png
index 33ae95c6a..c23673dbd 100755
--- a/view/theme/diabook-blue/icons/notifications.png
+++ b/view/theme/diabook-blue/icons/notifications.png
Binary files differ
diff --git a/view/theme/diabook-blue/style.css b/view/theme/diabook-blue/style.css
index 81c056bf3..67ee11769 100644
--- a/view/theme/diabook-blue/style.css
+++ b/view/theme/diabook-blue/style.css
@@ -970,6 +970,10 @@ aside #side-peoplefind-url {
widht: 55px;
height: 55px;
}
+#lost-password-link {
+ float: left;
+ margin-right: 20px;
+ }
/* widget */
.widget {
margin-bottom: 2em;
@@ -1065,7 +1069,8 @@ body .pageheader{
padding: 10px;
text-align: center;
font-size: 1.0em;
- margin-top: 140%;
+ clear: both;
+ display: block;
}
.tabs {
diff --git a/view/theme/diabook-blue/theme.php b/view/theme/diabook-blue/theme.php
index 1617dd7f0..38a282d3b 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:
*/
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/style.css b/view/theme/diabook/style.css
index badedb02f..9edd989b0 100644
--- a/view/theme/diabook/style.css
+++ b/view/theme/diabook/style.css
@@ -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;
@@ -1058,7 +1062,8 @@ body .pageheader{
padding: 10px;
text-align: center;
font-size: 1.0em;
- margin-top: 140%;
+ clear: both;
+ display: block;
}
.tabs {