diabook-themes: small bug/css-fixes ---> ver. 1.019

diff --git a/view/theme/diabook-aerith/admin_users.tpl b/view/theme/diabook-aerith/admin_users.tpl
new file mode 100644 (file)
index 0000000..40f94f5
--- /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 (executable)
index 0000000..a0b1dff
Binary files /dev/null and b/view/theme/diabook-aerith/icons/block.png differ

diff --git a/view/theme/diabook-aerith/nets.tpl b/view/theme/diabook-aerith/nets.tpl
index 68a8e88e9e213e6c6dc1cc2954cc317e340f72a3..be25ddee1b37763b2d84dab0e900b9db0aa1fc35 100644 (file)
--- 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 679d1d77eabcb87e80ef65057e586d3f3f8f9be4..82c5a257554f05ec47ebbbbf911d8beb89a25374 100644 (file)
--- 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 bbd9a5330b5bd9be48283db801eee1007a18eba7..be944b0af8d625eaf29cf01f566d08968ae11b3c 100644 (file)
--- 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 907865207ebf96aaceab9333087f3b608627f7c7..df93cbed846d41b41366828ee680c31d4bf0d46c 100644 (file)
--- 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 (file)
index 0000000..40f94f5
--- /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 (executable)
index 0000000..a0b1dff
Binary files /dev/null and b/view/theme/diabook-blue/icons/block.png differ

diff --git a/view/theme/diabook-blue/nets.tpl b/view/theme/diabook-blue/nets.tpl
index 68a8e88e9e213e6c6dc1cc2954cc317e340f72a3..be25ddee1b37763b2d84dab0e900b9db0aa1fc35 100644 (file)
--- 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 59d4fafe78ad8482de54cb116de7ad045ca8741c..d8e569338a586f5c58915833aa541a05fc7c878e 100644 (file)
--- 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 5459c65bddef29e4270e45ed54f72bdae79423cc..eb43b728e095a74f85c4fb049f5a83e52550a859 100644 (file)
--- 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 eb2d484ba02b69326ecfa4fd4c28f96a83e7ad70..2257f8df056e908e364299b9f1aa9b2b60957dd9 100644 (file)
--- 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 (file)
index 0000000..40f94f5
--- /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 (executable)
index 0000000..a0b1dff
Binary files /dev/null and b/view/theme/diabook-red/icons/block.png differ

diff --git a/view/theme/diabook-red/nets.tpl b/view/theme/diabook-red/nets.tpl
index 68a8e88e9e213e6c6dc1cc2954cc317e340f72a3..be25ddee1b37763b2d84dab0e900b9db0aa1fc35 100644 (file)
--- 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 03357f766a3e5793177f8ed552fef94371ec4293..1158687113d8df9f374508c46e85eab9bc223ab0 100644 (file)
--- 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 6ca2370debf5a3d7d954589df94f914ba913f46f..122096213938fd2808ab175b4e42af3d543540ab 100644 (file)
--- 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 479a0130a9864d5882c6e19b89f1936bddbec260..fb2ad21fd41af12b47da11bc208d9d7d5b697253 100644 (file)
--- 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 (file)
index 0000000..40f94f5
--- /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 (executable)
index 0000000..a0b1dff
Binary files /dev/null and b/view/theme/diabook/icons/block.png differ

diff --git a/view/theme/diabook/nets.tpl b/view/theme/diabook/nets.tpl
index 68a8e88e9e213e6c6dc1cc2954cc317e340f72a3..be25ddee1b37763b2d84dab0e900b9db0aa1fc35 100644 (file)
--- 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 0289419f4d915408ded0d03ff12a181e7c8b11b6..3156a1aa386ed1eb0db707ce11ec3ba0e87fd353 100644 (file)
--- 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 2e6a194813089362859e19711d5ccf2188a831ab..ba45f757e2f0029846f72ca5dc69be7021d893fd 100644 (file)
--- 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 64f82c4876a8e4f09c65bf4566dcef2cdb39e3b8..b6025b532e92dc5226b865ea67b8eba1ddaf310c 100644 (file)
--- 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 fa945f8489866e7e90fcdf9260204c5083da7e27..0afb2cac8864367a1794cb9cc463393996253c5e 100644 (file)
--- 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 8c5521eecae931142f9a78818a69c959dcfc4fcb..490a647f3dd43f42ab2e0777ab6efe16d28599a4 100755 (executable)
--- 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