aboutsummaryrefslogtreecommitdiffstats
path: root/view
diff options
context:
space:
mode:
authortommy tomson <thomas.bierey@gmx.de>2012-04-16 18:51:08 +0200
committertommy tomson <thomas.bierey@gmx.de>2012-04-16 18:51:08 +0200
commit15dc8f4b212a0554844fcc3104942fe6fc944918 (patch)
treea3c9fc740995683b25163c128dc64b86e40333e5 /view
parentb32a7315172937490b5a63095d595a48d837823d (diff)
downloadvolse-hubzilla-15dc8f4b212a0554844fcc3104942fe6fc944918.tar.gz
volse-hubzilla-15dc8f4b212a0554844fcc3104942fe6fc944918.tar.bz2
volse-hubzilla-15dc8f4b212a0554844fcc3104942fe6fc944918.zip
diabook-themes: small bug/css-fixes ---> ver. 1.019
Diffstat (limited to 'view')
-rw-r--r--view/theme/diabook-aerith/admin_users.tpl88
-rwxr-xr-xview/theme/diabook-aerith/icons/block.pngbin0 -> 335 bytes
-rw-r--r--view/theme/diabook-aerith/nets.tpl2
-rw-r--r--view/theme/diabook-aerith/style-network.css4
-rw-r--r--view/theme/diabook-aerith/style.css8
-rw-r--r--view/theme/diabook-aerith/theme.php4
-rw-r--r--view/theme/diabook-blue/admin_users.tpl88
-rwxr-xr-xview/theme/diabook-blue/icons/block.pngbin0 -> 335 bytes
-rw-r--r--view/theme/diabook-blue/nets.tpl2
-rw-r--r--view/theme/diabook-blue/style-network.css4
-rw-r--r--view/theme/diabook-blue/style.css8
-rw-r--r--view/theme/diabook-blue/theme.php4
-rw-r--r--view/theme/diabook-red/admin_users.tpl88
-rwxr-xr-xview/theme/diabook-red/icons/block.pngbin0 -> 335 bytes
-rw-r--r--view/theme/diabook-red/nets.tpl2
-rw-r--r--view/theme/diabook-red/style-network.css4
-rw-r--r--view/theme/diabook-red/style.css8
-rw-r--r--view/theme/diabook-red/theme.php4
-rw-r--r--view/theme/diabook/admin_users.tpl88
-rwxr-xr-xview/theme/diabook/icons/block.pngbin0 -> 335 bytes
-rw-r--r--view/theme/diabook/nets.tpl2
-rw-r--r--view/theme/diabook/style-network-wide.css4
-rw-r--r--view/theme/diabook/style-network.css4
-rw-r--r--view/theme/diabook/style-wide.css8
-rw-r--r--view/theme/diabook/style.css12
-rwxr-xr-xview/theme/diabook/theme.php4
26 files changed, 419 insertions, 21 deletions
diff --git a/view/theme/diabook-aerith/admin_users.tpl b/view/theme/diabook-aerith/admin_users.tpl
new file mode 100644
index 000000000..40f94f5fe
--- /dev/null
+++ b/view/theme/diabook-aerith/admin_users.tpl
@@ -0,0 +1,88 @@
+<script>
+ function confirm_delete(uname){
+ return confirm( "$confirm_delete".format(uname));
+ }
+ function confirm_delete_multi(){
+ return confirm("$confirm_delete_multi");
+ }
+ function selectall(cls){
+ $("."+cls).attr('checked','checked');
+ return false;
+ }
+</script>
+<div id='adminpage'>
+ <h1>$title - $page</h1>
+
+ <form action="$baseurl/admin/users" method="post">
+
+ <h3>$h_pending</h3>
+ {{ if $pending }}
+ <table id='pending'>
+ <thead>
+ <tr>
+ {{ for $th_pending as $th }}<th>$th</th>{{ endfor }}
+ <th></th>
+ <th></th>
+ </tr>
+ </thead>
+ <tbody>
+ {{ for $pending as $u }}
+ <tr>
+ <td class="created">$u.created</td>
+ <td class="name">$u.name</td>
+ <td class="email">$u.email</td>
+ <td class="checkbox"><input type="checkbox" class="pending_ckbx" id="id_pending_$u.hash" name="pending[]" value="$u.hash" /></td>
+ <td class="tools">
+ <a href="$baseurl/regmod/allow/$u.hash" title='$approve'><span class='icon like'></span></a>
+ <a href="$baseurl/regmod/deny/$u.hash" title='$deny'><span class='icon dislike'></span></a>
+ </td>
+ </tr>
+ {{ endfor }}
+ </tbody>
+ </table>
+ <div class='selectall'><a href='#' onclick="return selectall('pending_ckbx');">$select_all</a></div>
+ <div class="submit"><input type="submit" name="page_users_deny" value="$deny"/> <input type="submit" name="page_users_approve" value="$approve" /></div>
+ {{ else }}
+ <p>$no_pending</p>
+ {{ endif }}
+
+
+
+
+ <h3>$h_users</h3>
+ {{ if $users }}
+ <table id='users'>
+ <thead>
+ <tr>
+ <th></th>
+ {{ for $th_users as $th }}<th>$th</th>{{ endfor }}
+ <th></th>
+ <th></th>
+ </tr>
+ </thead>
+ <tbody>
+ {{ for $users as $u }}
+ <tr>
+ <td><img src="$u.micro" alt="$u.nickname" title="$u.nickname"></td>
+ <td class='name'><a href="$u.url" title="$u.nickname" >$u.name</a></td>
+ <td class='email'>$u.email</td>
+ <td class='register_date'>$u.register_date</td>
+ <td class='login_date'>$u.login_date</td>
+ <td class='lastitem_date'>$u.lastitem_date</td>
+ <td class='login_date'>$u.page-flags</td>
+ <td class="checkbox"><input type="checkbox" class="users_ckbx" id="id_user_$u.uid" name="user[]" value="$u.uid"/></td>
+ <td class="tools" style="width:60px;">
+ <a href="$baseurl/admin/users/block/$u.uid" title='{{ if $u.blocked }}$unblock{{ else }}$block{{ endif }}'><span class='icon block {{ if $u.blocked==0 }}dim{{ endif }}'></span></a>
+ <a href="$baseurl/admin/users/delete/$u.uid" title='$delete' onclick="return confirm_delete('$u.name')"><span class='icon ad_drop'></span></a>
+ </td>
+ </tr>
+ {{ endfor }}
+ </tbody>
+ </table>
+ <div class='selectall'><a href='#' onclick="return selectall('users_ckbx');">$select_all</a></div>
+ <div class="submit"><input type="submit" name="page_users_block" value="$block/$unblock" /> <input type="submit" name="page_users_delete" value="$delete" onclick="return confirm_delete_multi()" /></div>
+ {{ else }}
+ NO USERS?!?
+ {{ endif }}
+ </form>
+</div>
diff --git a/view/theme/diabook-aerith/icons/block.png b/view/theme/diabook-aerith/icons/block.png
new file mode 100755
index 000000000..a0b1dffe9
--- /dev/null
+++ b/view/theme/diabook-aerith/icons/block.png
Binary files differ
diff --git a/view/theme/diabook-aerith/nets.tpl b/view/theme/diabook-aerith/nets.tpl
index 68a8e88e9..be25ddee1 100644
--- a/view/theme/diabook-aerith/nets.tpl
+++ b/view/theme/diabook-aerith/nets.tpl
@@ -1,5 +1,5 @@
<div id="profile_side">
- <h3>$title</h3>
+ <h3 style="margin-left: 2px;">$title</h3>
<div id="nets-desc">$desc</div>
<ul class="menu-profile-side">
diff --git a/view/theme/diabook-aerith/style-network.css b/view/theme/diabook-aerith/style-network.css
index 679d1d77e..82c5a2575 100644
--- a/view/theme/diabook-aerith/style-network.css
+++ b/view/theme/diabook-aerith/style-network.css
@@ -1064,6 +1064,10 @@ aside #search-text {
border-top-right-radius: 15px;
border-bottom-right-radius: 15px;
border-bottom-left-radius: 15px;
+-moz-border-bottom-colors: #dbdbdb;
+ -moz-border-top-colors: #999;
+ -moz-border-left-colors: #999;
+ -moz-border-right-colors: #dbdbdb;
}
aside #side-follow-url {
width: 150px;
diff --git a/view/theme/diabook-aerith/style.css b/view/theme/diabook-aerith/style.css
index bbd9a5330..be944b0af 100644
--- a/view/theme/diabook-aerith/style.css
+++ b/view/theme/diabook-aerith/style.css
@@ -169,13 +169,17 @@
}
.edit {background-image: url("../../../view/theme/diabook-aerith/icons/pencil2.png");
display: block; width: 28px; height: 28px; background-repeat: no-repeat;}
-
+.icon.block {background-image: url("../../../view/theme/diabook/icons/block.png");
+ display: block; width: 16px; height: 16px; background-repeat: no-repeat;}
+.icon.block.dim {background-image: url("../../../view/theme/diabook/icons/block.png");
+ display: block; width: 16px; height: 16px; background-repeat: no-repeat; opacity: 0.3;}
+.icon.ad_drop { background-image: url("../../../view/theme/diabook/icons/drop.png");
+ display: block; margin-left:5px; width: 16px; height: 16px; background-repeat: no-repeat;}
.article { background-position: -50px 0px;}
/*.audio { background-position: -70px 0px;}*/
-.block { background-position: -90px 0px;}
/*.drop { background-position: -110px 0px;}*/
/*.drophide { background-position: -130px 0px;}*/
/*.edit { background-position: -150px 0px;}*/
diff --git a/view/theme/diabook-aerith/theme.php b/view/theme/diabook-aerith/theme.php
index 907865207..df93cbed8 100644
--- a/view/theme/diabook-aerith/theme.php
+++ b/view/theme/diabook-aerith/theme.php
@@ -3,13 +3,13 @@
/*
* Name: Diabook-aerith
* Description: Diabook-aerith : report bugs and request here: http://pad.toktan.org/p/diabook or contact me : thomas_bierey@friendica.eu
- * Version: (Version: 1.018)
+ * Version: (Version: 1.019)
* Author:
*/
//print diabook-version for debugging
-$diabook_version = "Diabook-aerith (Version: 1.018)";
+$diabook_version = "Diabook-aerith (Version: 1.019)";
$a->page['htmlhead'] .= sprintf('<script "%s" ></script>', $diabook_version);
diff --git a/view/theme/diabook-blue/admin_users.tpl b/view/theme/diabook-blue/admin_users.tpl
new file mode 100644
index 000000000..40f94f5fe
--- /dev/null
+++ b/view/theme/diabook-blue/admin_users.tpl
@@ -0,0 +1,88 @@
+<script>
+ function confirm_delete(uname){
+ return confirm( "$confirm_delete".format(uname));
+ }
+ function confirm_delete_multi(){
+ return confirm("$confirm_delete_multi");
+ }
+ function selectall(cls){
+ $("."+cls).attr('checked','checked');
+ return false;
+ }
+</script>
+<div id='adminpage'>
+ <h1>$title - $page</h1>
+
+ <form action="$baseurl/admin/users" method="post">
+
+ <h3>$h_pending</h3>
+ {{ if $pending }}
+ <table id='pending'>
+ <thead>
+ <tr>
+ {{ for $th_pending as $th }}<th>$th</th>{{ endfor }}
+ <th></th>
+ <th></th>
+ </tr>
+ </thead>
+ <tbody>
+ {{ for $pending as $u }}
+ <tr>
+ <td class="created">$u.created</td>
+ <td class="name">$u.name</td>
+ <td class="email">$u.email</td>
+ <td class="checkbox"><input type="checkbox" class="pending_ckbx" id="id_pending_$u.hash" name="pending[]" value="$u.hash" /></td>
+ <td class="tools">
+ <a href="$baseurl/regmod/allow/$u.hash" title='$approve'><span class='icon like'></span></a>
+ <a href="$baseurl/regmod/deny/$u.hash" title='$deny'><span class='icon dislike'></span></a>
+ </td>
+ </tr>
+ {{ endfor }}
+ </tbody>
+ </table>
+ <div class='selectall'><a href='#' onclick="return selectall('pending_ckbx');">$select_all</a></div>
+ <div class="submit"><input type="submit" name="page_users_deny" value="$deny"/> <input type="submit" name="page_users_approve" value="$approve" /></div>
+ {{ else }}
+ <p>$no_pending</p>
+ {{ endif }}
+
+
+
+
+ <h3>$h_users</h3>
+ {{ if $users }}
+ <table id='users'>
+ <thead>
+ <tr>
+ <th></th>
+ {{ for $th_users as $th }}<th>$th</th>{{ endfor }}
+ <th></th>
+ <th></th>
+ </tr>
+ </thead>
+ <tbody>
+ {{ for $users as $u }}
+ <tr>
+ <td><img src="$u.micro" alt="$u.nickname" title="$u.nickname"></td>
+ <td class='name'><a href="$u.url" title="$u.nickname" >$u.name</a></td>
+ <td class='email'>$u.email</td>
+ <td class='register_date'>$u.register_date</td>
+ <td class='login_date'>$u.login_date</td>
+ <td class='lastitem_date'>$u.lastitem_date</td>
+ <td class='login_date'>$u.page-flags</td>
+ <td class="checkbox"><input type="checkbox" class="users_ckbx" id="id_user_$u.uid" name="user[]" value="$u.uid"/></td>
+ <td class="tools" style="width:60px;">
+ <a href="$baseurl/admin/users/block/$u.uid" title='{{ if $u.blocked }}$unblock{{ else }}$block{{ endif }}'><span class='icon block {{ if $u.blocked==0 }}dim{{ endif }}'></span></a>
+ <a href="$baseurl/admin/users/delete/$u.uid" title='$delete' onclick="return confirm_delete('$u.name')"><span class='icon ad_drop'></span></a>
+ </td>
+ </tr>
+ {{ endfor }}
+ </tbody>
+ </table>
+ <div class='selectall'><a href='#' onclick="return selectall('users_ckbx');">$select_all</a></div>
+ <div class="submit"><input type="submit" name="page_users_block" value="$block/$unblock" /> <input type="submit" name="page_users_delete" value="$delete" onclick="return confirm_delete_multi()" /></div>
+ {{ else }}
+ NO USERS?!?
+ {{ endif }}
+ </form>
+</div>
diff --git a/view/theme/diabook-blue/icons/block.png b/view/theme/diabook-blue/icons/block.png
new file mode 100755
index 000000000..a0b1dffe9
--- /dev/null
+++ b/view/theme/diabook-blue/icons/block.png
Binary files differ
diff --git a/view/theme/diabook-blue/nets.tpl b/view/theme/diabook-blue/nets.tpl
index 68a8e88e9..be25ddee1 100644
--- a/view/theme/diabook-blue/nets.tpl
+++ b/view/theme/diabook-blue/nets.tpl
@@ -1,5 +1,5 @@
<div id="profile_side">
- <h3>$title</h3>
+ <h3 style="margin-left: 2px;">$title</h3>
<div id="nets-desc">$desc</div>
<ul class="menu-profile-side">
diff --git a/view/theme/diabook-blue/style-network.css b/view/theme/diabook-blue/style-network.css
index 59d4fafe7..d8e569338 100644
--- a/view/theme/diabook-blue/style-network.css
+++ b/view/theme/diabook-blue/style-network.css
@@ -1030,6 +1030,10 @@ aside #search-text {
border-top-right-radius: 15px;
border-bottom-right-radius: 15px;
border-bottom-left-radius: 15px;
+-moz-border-bottom-colors: #dbdbdb;
+ -moz-border-top-colors: #999;
+ -moz-border-left-colors: #999;
+ -moz-border-right-colors: #dbdbdb;
}
aside #side-follow-url {
width: 150px;
diff --git a/view/theme/diabook-blue/style.css b/view/theme/diabook-blue/style.css
index 5459c65bd..eb43b728e 100644
--- a/view/theme/diabook-blue/style.css
+++ b/view/theme/diabook-blue/style.css
@@ -168,13 +168,17 @@
}
.edit {background-image: url("../../../view/theme/diabook-blue/icons/pencil2.png");
display: block; width: 28px; height: 28px; background-repeat: no-repeat;}
-
+.icon.block {background-image: url("../../../view/theme/diabook/icons/block.png");
+ display: block; width: 16px; height: 16px; background-repeat: no-repeat;}
+.icon.block.dim {background-image: url("../../../view/theme/diabook/icons/block.png");
+ display: block; width: 16px; height: 16px; background-repeat: no-repeat; opacity: 0.3;}
+.icon.ad_drop { background-image: url("../../../view/theme/diabook/icons/drop.png");
+ display: block; margin-left:5px; width: 16px; height: 16px; background-repeat: no-repeat;}
.article { background-position: -50px 0px;}
/*.audio { background-position: -70px 0px;}*/
-.block { background-position: -90px 0px;}
/*.drop { background-position: -110px 0px;}*/
/*.drophide { background-position: -130px 0px;}*/
/*.edit { background-position: -150px 0px;}*/
diff --git a/view/theme/diabook-blue/theme.php b/view/theme/diabook-blue/theme.php
index eb2d484ba..2257f8df0 100644
--- a/view/theme/diabook-blue/theme.php
+++ b/view/theme/diabook-blue/theme.php
@@ -3,13 +3,13 @@
/*
* 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: (Version: 1.018)
+ * Version: (Version: 1.019)
* Author:
*/
//print diabook-version for debugging
-$diabook_version = "Diabook-blue (Version: 1.018)";
+$diabook_version = "Diabook-blue (Version: 1.019)";
$a->page['htmlhead'] .= sprintf('<script "%s" ></script>', $diabook_version);
//change css on network and profilepages
diff --git a/view/theme/diabook-red/admin_users.tpl b/view/theme/diabook-red/admin_users.tpl
new file mode 100644
index 000000000..40f94f5fe
--- /dev/null
+++ b/view/theme/diabook-red/admin_users.tpl
@@ -0,0 +1,88 @@
+<script>
+ function confirm_delete(uname){
+ return confirm( "$confirm_delete".format(uname));
+ }
+ function confirm_delete_multi(){
+ return confirm("$confirm_delete_multi");
+ }
+ function selectall(cls){
+ $("."+cls).attr('checked','checked');
+ return false;
+ }
+</script>
+<div id='adminpage'>
+ <h1>$title - $page</h1>
+
+ <form action="$baseurl/admin/users" method="post">
+
+ <h3>$h_pending</h3>
+ {{ if $pending }}
+ <table id='pending'>
+ <thead>
+ <tr>
+ {{ for $th_pending as $th }}<th>$th</th>{{ endfor }}
+ <th></th>
+ <th></th>
+ </tr>
+ </thead>
+ <tbody>
+ {{ for $pending as $u }}
+ <tr>
+ <td class="created">$u.created</td>
+ <td class="name">$u.name</td>
+ <td class="email">$u.email</td>
+ <td class="checkbox"><input type="checkbox" class="pending_ckbx" id="id_pending_$u.hash" name="pending[]" value="$u.hash" /></td>
+ <td class="tools">
+ <a href="$baseurl/regmod/allow/$u.hash" title='$approve'><span class='icon like'></span></a>
+ <a href="$baseurl/regmod/deny/$u.hash" title='$deny'><span class='icon dislike'></span></a>
+ </td>
+ </tr>
+ {{ endfor }}
+ </tbody>
+ </table>
+ <div class='selectall'><a href='#' onclick="return selectall('pending_ckbx');">$select_all</a></div>
+ <div class="submit"><input type="submit" name="page_users_deny" value="$deny"/> <input type="submit" name="page_users_approve" value="$approve" /></div>
+ {{ else }}
+ <p>$no_pending</p>
+ {{ endif }}
+
+
+
+
+ <h3>$h_users</h3>
+ {{ if $users }}
+ <table id='users'>
+ <thead>
+ <tr>
+ <th></th>
+ {{ for $th_users as $th }}<th>$th</th>{{ endfor }}
+ <th></th>
+ <th></th>
+ </tr>
+ </thead>
+ <tbody>
+ {{ for $users as $u }}
+ <tr>
+ <td><img src="$u.micro" alt="$u.nickname" title="$u.nickname"></td>
+ <td class='name'><a href="$u.url" title="$u.nickname" >$u.name</a></td>
+ <td class='email'>$u.email</td>
+ <td class='register_date'>$u.register_date</td>
+ <td class='login_date'>$u.login_date</td>
+ <td class='lastitem_date'>$u.lastitem_date</td>
+ <td class='login_date'>$u.page-flags</td>
+ <td class="checkbox"><input type="checkbox" class="users_ckbx" id="id_user_$u.uid" name="user[]" value="$u.uid"/></td>
+ <td class="tools" style="width:60px;">
+ <a href="$baseurl/admin/users/block/$u.uid" title='{{ if $u.blocked }}$unblock{{ else }}$block{{ endif }}'><span class='icon block {{ if $u.blocked==0 }}dim{{ endif }}'></span></a>
+ <a href="$baseurl/admin/users/delete/$u.uid" title='$delete' onclick="return confirm_delete('$u.name')"><span class='icon ad_drop'></span></a>
+ </td>
+ </tr>
+ {{ endfor }}
+ </tbody>
+ </table>
+ <div class='selectall'><a href='#' onclick="return selectall('users_ckbx');">$select_all</a></div>
+ <div class="submit"><input type="submit" name="page_users_block" value="$block/$unblock" /> <input type="submit" name="page_users_delete" value="$delete" onclick="return confirm_delete_multi()" /></div>
+ {{ else }}
+ NO USERS?!?
+ {{ endif }}
+ </form>
+</div>
diff --git a/view/theme/diabook-red/icons/block.png b/view/theme/diabook-red/icons/block.png
new file mode 100755
index 000000000..a0b1dffe9
--- /dev/null
+++ b/view/theme/diabook-red/icons/block.png
Binary files differ
diff --git a/view/theme/diabook-red/nets.tpl b/view/theme/diabook-red/nets.tpl
index 68a8e88e9..be25ddee1 100644
--- a/view/theme/diabook-red/nets.tpl
+++ b/view/theme/diabook-red/nets.tpl
@@ -1,5 +1,5 @@
<div id="profile_side">
- <h3>$title</h3>
+ <h3 style="margin-left: 2px;">$title</h3>
<div id="nets-desc">$desc</div>
<ul class="menu-profile-side">
diff --git a/view/theme/diabook-red/style-network.css b/view/theme/diabook-red/style-network.css
index 03357f766..115868711 100644
--- a/view/theme/diabook-red/style-network.css
+++ b/view/theme/diabook-red/style-network.css
@@ -1064,6 +1064,10 @@ aside #search-text {
border-top-right-radius: 15px;
border-bottom-right-radius: 15px;
border-bottom-left-radius: 15px;
+-moz-border-bottom-colors: #dbdbdb;
+ -moz-border-top-colors: #999;
+ -moz-border-left-colors: #999;
+ -moz-border-right-colors: #dbdbdb;
}
aside #side-follow-url {
width: 150px;
diff --git a/view/theme/diabook-red/style.css b/view/theme/diabook-red/style.css
index 6ca2370de..122096213 100644
--- a/view/theme/diabook-red/style.css
+++ b/view/theme/diabook-red/style.css
@@ -168,13 +168,17 @@
}
.edit {background-image: url("../../../view/theme/diabook-red/icons/pencil2.png");
display: block; width: 28px; height: 28px; background-repeat: no-repeat;}
-
+.icon.block {background-image: url("../../../view/theme/diabook/icons/block.png");
+ display: block; width: 16px; height: 16px; background-repeat: no-repeat;}
+.icon.block.dim {background-image: url("../../../view/theme/diabook/icons/block.png");
+ display: block; width: 16px; height: 16px; background-repeat: no-repeat; opacity: 0.3;}
+.icon.ad_drop { background-image: url("../../../view/theme/diabook/icons/drop.png");
+ display: block; margin-left:5px; width: 16px; height: 16px; background-repeat: no-repeat;}
.article { background-position: -50px 0px;}
/*.audio { background-position: -70px 0px;}*/
-.block { background-position: -90px 0px;}
/*.drop { background-position: -110px 0px;}*/
/*.drophide { background-position: -130px 0px;}*/
/*.edit { background-position: -150px 0px;}*/
diff --git a/view/theme/diabook-red/theme.php b/view/theme/diabook-red/theme.php
index 479a0130a..fb2ad21fd 100644
--- a/view/theme/diabook-red/theme.php
+++ b/view/theme/diabook-red/theme.php
@@ -3,13 +3,13 @@
/*
* Name: Diabook-red
* Description: Diabook-red: report bugs and request here: http://pad.toktan.org/p/diabook or contact me : thomas_bierey@friendica.eu
- * Version: (Version: 1.018)
+ * Version: (Version: 1.019)
* Author:
*/
//print diabook-version for debugging
-$diabook_version = "Diabook-red (Version: 1.018)";
+$diabook_version = "Diabook-red (Version: 1.019)";
$a->page['htmlhead'] .= sprintf('<script "%s" ></script>', $diabook_version);
//change css on network and profilepages
diff --git a/view/theme/diabook/admin_users.tpl b/view/theme/diabook/admin_users.tpl
new file mode 100644
index 000000000..40f94f5fe
--- /dev/null
+++ b/view/theme/diabook/admin_users.tpl
@@ -0,0 +1,88 @@
+<script>
+ function confirm_delete(uname){
+ return confirm( "$confirm_delete".format(uname));
+ }
+ function confirm_delete_multi(){
+ return confirm("$confirm_delete_multi");
+ }
+ function selectall(cls){
+ $("."+cls).attr('checked','checked');
+ return false;
+ }
+</script>
+<div id='adminpage'>
+ <h1>$title - $page</h1>
+
+ <form action="$baseurl/admin/users" method="post">
+
+ <h3>$h_pending</h3>
+ {{ if $pending }}
+ <table id='pending'>
+ <thead>
+ <tr>
+ {{ for $th_pending as $th }}<th>$th</th>{{ endfor }}
+ <th></th>
+ <th></th>
+ </tr>
+ </thead>
+ <tbody>
+ {{ for $pending as $u }}
+ <tr>
+ <td class="created">$u.created</td>
+ <td class="name">$u.name</td>
+ <td class="email">$u.email</td>
+ <td class="checkbox"><input type="checkbox" class="pending_ckbx" id="id_pending_$u.hash" name="pending[]" value="$u.hash" /></td>
+ <td class="tools">
+ <a href="$baseurl/regmod/allow/$u.hash" title='$approve'><span class='icon like'></span></a>
+ <a href="$baseurl/regmod/deny/$u.hash" title='$deny'><span class='icon dislike'></span></a>
+ </td>
+ </tr>
+ {{ endfor }}
+ </tbody>
+ </table>
+ <div class='selectall'><a href='#' onclick="return selectall('pending_ckbx');">$select_all</a></div>
+ <div class="submit"><input type="submit" name="page_users_deny" value="$deny"/> <input type="submit" name="page_users_approve" value="$approve" /></div>
+ {{ else }}
+ <p>$no_pending</p>
+ {{ endif }}
+
+
+
+
+ <h3>$h_users</h3>
+ {{ if $users }}
+ <table id='users'>
+ <thead>
+ <tr>
+ <th></th>
+ {{ for $th_users as $th }}<th>$th</th>{{ endfor }}
+ <th></th>
+ <th></th>
+ </tr>
+ </thead>
+ <tbody>
+ {{ for $users as $u }}
+ <tr>
+ <td><img src="$u.micro" alt="$u.nickname" title="$u.nickname"></td>
+ <td class='name'><a href="$u.url" title="$u.nickname" >$u.name</a></td>
+ <td class='email'>$u.email</td>
+ <td class='register_date'>$u.register_date</td>
+ <td class='login_date'>$u.login_date</td>
+ <td class='lastitem_date'>$u.lastitem_date</td>
+ <td class='login_date'>$u.page-flags</td>
+ <td class="checkbox"><input type="checkbox" class="users_ckbx" id="id_user_$u.uid" name="user[]" value="$u.uid"/></td>
+ <td class="tools" style="width:60px;">
+ <a href="$baseurl/admin/users/block/$u.uid" title='{{ if $u.blocked }}$unblock{{ else }}$block{{ endif }}'><span class='icon block {{ if $u.blocked==0 }}dim{{ endif }}'></span></a>
+ <a href="$baseurl/admin/users/delete/$u.uid" title='$delete' onclick="return confirm_delete('$u.name')"><span class='icon ad_drop'></span></a>
+ </td>
+ </tr>
+ {{ endfor }}
+ </tbody>
+ </table>
+ <div class='selectall'><a href='#' onclick="return selectall('users_ckbx');">$select_all</a></div>
+ <div class="submit"><input type="submit" name="page_users_block" value="$block/$unblock" /> <input type="submit" name="page_users_delete" value="$delete" onclick="return confirm_delete_multi()" /></div>
+ {{ else }}
+ NO USERS?!?
+ {{ endif }}
+ </form>
+</div>
diff --git a/view/theme/diabook/icons/block.png b/view/theme/diabook/icons/block.png
new file mode 100755
index 000000000..a0b1dffe9
--- /dev/null
+++ b/view/theme/diabook/icons/block.png
Binary files differ
diff --git a/view/theme/diabook/nets.tpl b/view/theme/diabook/nets.tpl
index 68a8e88e9..be25ddee1 100644
--- a/view/theme/diabook/nets.tpl
+++ b/view/theme/diabook/nets.tpl
@@ -1,5 +1,5 @@
<div id="profile_side">
- <h3>$title</h3>
+ <h3 style="margin-left: 2px;">$title</h3>
<div id="nets-desc">$desc</div>
<ul class="menu-profile-side">
diff --git a/view/theme/diabook/style-network-wide.css b/view/theme/diabook/style-network-wide.css
index 0289419f4..3156a1aa3 100644
--- a/view/theme/diabook/style-network-wide.css
+++ b/view/theme/diabook/style-network-wide.css
@@ -1026,6 +1026,10 @@ aside #search-text {
border-top-right-radius: 15px;
border-bottom-right-radius: 15px;
border-bottom-left-radius: 15px;
+-moz-border-bottom-colors: #dbdbdb;
+ -moz-border-top-colors: #999;
+ -moz-border-left-colors: #999;
+ -moz-border-right-colors: #dbdbdb;
}
aside #side-follow-url {
width: 150px;
diff --git a/view/theme/diabook/style-network.css b/view/theme/diabook/style-network.css
index 2e6a19481..ba45f757e 100644
--- a/view/theme/diabook/style-network.css
+++ b/view/theme/diabook/style-network.css
@@ -1023,6 +1023,10 @@ aside #search-text {
border-top-right-radius: 15px;
border-bottom-right-radius: 15px;
border-bottom-left-radius: 15px;
+ -moz-border-bottom-colors: #dbdbdb;
+ -moz-border-top-colors: #999;
+ -moz-border-left-colors: #999;
+ -moz-border-right-colors: #dbdbdb;
}
aside #side-follow-url {
width: 150px;
diff --git a/view/theme/diabook/style-wide.css b/view/theme/diabook/style-wide.css
index 64f82c487..b6025b532 100644
--- a/view/theme/diabook/style-wide.css
+++ b/view/theme/diabook/style-wide.css
@@ -168,13 +168,17 @@
}
.edit {background-image: url("../../../view/theme/diabook/icons/pencil2.png");
display: block; width: 28px; height: 28px; background-repeat: no-repeat;}
-
+.icon.block {background-image: url("../../../view/theme/diabook/icons/block.png");
+ display: block; width: 16px; height: 16px; background-repeat: no-repeat;}
+.icon.block.dim {background-image: url("../../../view/theme/diabook/icons/block.png");
+ display: block; width: 16px; height: 16px; background-repeat: no-repeat; opacity: 0.3;}
+.icon.ad_drop { background-image: url("../../../view/theme/diabook/icons/drop.png");
+ display: block; margin-left:5px; width: 16px; height: 16px; background-repeat: no-repeat;}
.article { background-position: -50px 0px;}
/*.audio { background-position: -70px 0px;}*/
-.block { background-position: -90px 0px;}
/*.drop { background-position: -110px 0px;}*/
/*.drophide { background-position: -130px 0px;}*/
/*.edit { background-position: -150px 0px;}*/
diff --git a/view/theme/diabook/style.css b/view/theme/diabook/style.css
index fa945f848..0afb2cac8 100644
--- a/view/theme/diabook/style.css
+++ b/view/theme/diabook/style.css
@@ -168,13 +168,19 @@
}
.edit {background-image: url("../../../view/theme/diabook/icons/pencil2.png");
display: block; width: 28px; height: 28px; background-repeat: no-repeat;}
+.icon.block {background-image: url("../../../view/theme/diabook/icons/block.png");
+ display: block; width: 16px; height: 16px; background-repeat: no-repeat;}
+.icon.block.dim {background-image: url("../../../view/theme/diabook/icons/block.png");
+ display: block; width: 16px; height: 16px; background-repeat: no-repeat; opacity: 0.3;}
+.icon.ad_drop { background-image: url("../../../view/theme/diabook/icons/drop.png");
+ display: block; margin-left:5px; width: 16px; height: 16px; background-repeat: no-repeat;}
.article { background-position: -50px 0px;}
/*.audio { background-position: -70px 0px;}*/
-.block { background-position: -90px 0px;}
+/*.block { background-position: -90px 0px;}*/
/*.drop { background-position: -110px 0px;}*/
/*.drophide { background-position: -130px 0px;}*/
/*.edit { background-position: -150px 0px;}*/
@@ -1146,6 +1152,10 @@ aside #search-text {
border-top-right-radius: 15px;
border-bottom-right-radius: 15px;
border-bottom-left-radius: 15px;
+-moz-border-bottom-colors: #dbdbdb;
+ -moz-border-top-colors: #999;
+ -moz-border-left-colors: #999;
+ -moz-border-right-colors: #dbdbdb;
}
aside #side-follow-url {
width: 173px;
diff --git a/view/theme/diabook/theme.php b/view/theme/diabook/theme.php
index 8c5521eec..490a647f3 100755
--- a/view/theme/diabook/theme.php
+++ b/view/theme/diabook/theme.php
@@ -3,13 +3,13 @@
/*
* Name: Diabook
* Description: Diabook: report bugs and request here: http://pad.toktan.org/p/diabook or contact me : thomas_bierey@friendica.eu
- * Version: (Version: 1.018)
+ * Version: (Version: 1.019)
* Author:
*/
//print diabook-version for debugging
-$diabook_version = "Diabook (Version: 1.018)";
+$diabook_version = "Diabook (Version: 1.019)";
$a->page['htmlhead'] .= sprintf('<script "%s" ></script>', $diabook_version);
//change css on network and profilepages