fix css in aside

diff --git a/view/theme/diabook/icons/com_side.png b/view/theme/diabook/icons/com_side.png
index bc5969ef1afd41f0cfba08f51a0ac17356e60c3f..00186ba05aa66bbcec9f5011e49b8c458e83160f 100644 (file)
Binary files a/view/theme/diabook/icons/com_side.png and b/view/theme/diabook/icons/com_side.png differ

diff --git a/view/theme/diabook/icons/events.png b/view/theme/diabook/icons/events.png
index 4a0b3f3f11316265ad45472244094c3fbc27147d..cf195fbb6bd829cae6f08cfb6459339087368965 100644 (file)
Binary files a/view/theme/diabook/icons/events.png and b/view/theme/diabook/icons/events.png differ

diff --git a/view/theme/diabook/icons/home.png b/view/theme/diabook/icons/home.png
index be47a48fc3638b94385eec044d6373e056890b09..5c610805f568139d5750639dab63e3b9a319adab 100644 (file)
Binary files a/view/theme/diabook/icons/home.png and b/view/theme/diabook/icons/home.png differ

diff --git a/view/theme/diabook/icons/mess_side.png b/view/theme/diabook/icons/mess_side.png
index 49ef896bc1dfa9cc75c70b231e282195cbd17c25..5295e2e7407e91701c92dd08628e1ca3cf1a9499 100644 (file)
Binary files a/view/theme/diabook/icons/mess_side.png and b/view/theme/diabook/icons/mess_side.png differ

diff --git a/view/theme/diabook/icons/notes.png b/view/theme/diabook/icons/notes.png
index 7d4afca908a3ef04d13fb81f8690656666da4824..28dca30a36dce1cdbf4d190244a410ca5089cba9 100644 (file)
Binary files a/view/theme/diabook/icons/notes.png and b/view/theme/diabook/icons/notes.png differ

diff --git a/view/theme/diabook/icons/pscontacts.png b/view/theme/diabook/icons/pscontacts.png
index acf857f32f3bfbe68a514527e995407f8c916527..23a78bcaca1536de8cbec87d15e672bf92107d96 100644 (file)
Binary files a/view/theme/diabook/icons/pscontacts.png and b/view/theme/diabook/icons/pscontacts.png differ

diff --git a/view/theme/diabook/icons/pubgroups.png b/view/theme/diabook/icons/pubgroups.png
index 6d9539610edbcc82e2ca5cbce6ec7e2aadcbd38a..ae04194b1eb94a7c0cd82d6fb3d09ca1e2cf21ec 100644 (file)
Binary files a/view/theme/diabook/icons/pubgroups.png and b/view/theme/diabook/icons/pubgroups.png differ

diff --git a/view/theme/diabook/nets.tpl b/view/theme/diabook/nets.tpl
new file mode 100644 (file)
index 0000000..21b022e
--- /dev/null
+++ b/view/theme/diabook/nets.tpl
@@ -0,0 +1,10 @@
+<div id="nets-sidebar" class="widget">
+       <h3>$title</h3>
+       <div id="nets-desc">$desc</div>
+       <a href="$base" class="nets-link{{ if $sel_all }} nets-selected{{ endif }} nets-all">$all</a>
+       <ul class="nets-ul">
+       {{ for $nets as $net }}
+       <li class="tool"><a href="$base?nets=$net.ref" class="nets-link{{ if $net.selected }} nets-selected{{ endif }}">$net.name</a></li>
+       {{ endfor }}
+       </ul>
+</div>

diff --git a/view/theme/diabook/profile_side.tpl b/view/theme/diabook/profile_side.tpl
index 0762dbe449eaf574f56ac99d5e05560d028ad415..01e80f2388413a3e7b33cf7a5da0ca519989d742 100644 (file)
--- a/view/theme/diabook/profile_side.tpl
+++ b/view/theme/diabook/profile_side.tpl
@@ -7,13 +7,13 @@
        </div>
        
 <ul id="profile-side-menu" class="menu-profile-side">
-       <li id="profile-side-status" class="menu-profile-list home"><a class="menu-profile-list-item" href="$ps.usermenu.status.0">$ps.usermenu.status.1</a></li>
-       <li id="profile-side-photos" class="menu-profile-list photos"><a class="menu-profile-list-item" href="$ps.usermenu.photos.0">$ps.usermenu.photos.1</a></li>
-       <li id="profile-side-photos" class="menu-profile-list pscontacts"><a class="menu-profile-list-item" href="$ps.usermenu.contacts.0">$ps.usermenu.contacts.1</a></li>             
-       <li id="profile-side-events" class="menu-profile-list events"><a class="menu-profile-list-item" href="$ps.usermenu.events.0">$ps.usermenu.events.1</a></li>
-       <li id="profile-side-notes" class="menu-profile-list notes"><a class="menu-profile-list-item" href="$ps.usermenu.notes.0">$ps.usermenu.notes.1</a></li>
-       <li id="profile-side-foren" class="menu-profile-list foren"><a class="menu-profile-list-item" href="$ps.usermenu.pgroups.0" target="blanc">$ps.usermenu.pgroups.1</a></li>
-       <li id="profile-side-foren" class="menu-profile-list com_side"><a class="menu-profile-list-item" href="$ps.usermenu.community.0">$ps.usermenu.community.1</a></li>
+       <li id="profile-side-status" class="menu-profile-list"><a class="menu-profile-list-item" href="$ps.usermenu.status.0">$ps.usermenu.status.1<span class="menu-profile-icon home"></span></a></li>
+       <li id="profile-side-photos" class="menu-profile-list photos"><a class="menu-profile-list-item" href="$ps.usermenu.photos.0">$ps.usermenu.photos.1<span class="menu-profile-icon photos"></span></a></li>
+       <li id="profile-side-photos" class="menu-profile-list pscontacts"><a class="menu-profile-list-item" href="$ps.usermenu.contacts.0">$ps.usermenu.contacts.1<span class="menu-profile-icon pscontacts"></span></a></li>           
+       <li id="profile-side-events" class="menu-profile-list events"><a class="menu-profile-list-item" href="$ps.usermenu.events.0">$ps.usermenu.events.1<span class="menu-profile-icon events"></span></a></li>
+       <li id="profile-side-notes" class="menu-profile-list notes"><a class="menu-profile-list-item" href="$ps.usermenu.notes.0">$ps.usermenu.notes.1<span class="menu-profile-icon notes"></span></a></li>
+       <li id="profile-side-foren" class="menu-profile-list foren"><a class="menu-profile-list-item" href="$ps.usermenu.pgroups.0" target="blanc">$ps.usermenu.pgroups.1<span class="menu-profile-icon foren"></span></a></li>
+       <li id="profile-side-foren" class="menu-profile-list com_side"><a class="menu-profile-list-item" href="$ps.usermenu.community.0">$ps.usermenu.community.1<span class="menu-profile-icon com_side"></span></a></li>
 </ul>
 
 </div>

diff --git a/view/theme/diabook/style-network.css b/view/theme/diabook/style-network.css
index ed7c76cbe9db99cb6cbbd70d418c82163ccd1d07..e9fa9d8ba405dad4ba73eb8e1e069562e2b008cd 100644 (file)
--- a/view/theme/diabook/style-network.css
+++ b/view/theme/diabook/style-network.css
@@ -484,8 +484,9 @@ code {
 }
 #saved-search-ul .tool:hover,
 #nets-sidebar .tool:hover,
-#sidebar-group-list .tool:hover {
-       background: #EEE;
+#sidebar-group-list .tool:hover,
+#fileas-sidebar .tool:hover {
+       background: #E7F2F7;
 }
 .tool .label {
   float: left;
@@ -898,44 +899,57 @@ ul.menu-popup .empty {
        }
 .menu-profile-list{
   height: auto;
-  overflow: auto;
-  padding-top: 3px;
-  padding-bottom: 3px;
-  padding-left: 16px;
+  overflow: auto;  
   min-height: 16px;
   list-style: none;
        }
 .menu-profile-list:hover{
-       background: #EEE;
+       background: #E7F2F7; 
        }
 .menu-profile-list-item{
        padding-left: 5px;
+       vertical-align: middle;
        }       
 .menu-profile-list-item:hover{ 
        text-decoration: none;
    }
 /*http://prothemedesign.com/circular-icons/*/
-.menu-profile-list.home{
+.menu-profile-icon.home{
        background: url("../../../view/theme/diabook/icons/home.png") no-repeat;
+       float: left;
+       height: 22px;
+       width: 22px;
        }
-.menu-profile-list.photos{
+.menu-profile-icon.photos{
        background: url("../../../view/theme/diabook/icons/mess_side.png") no-repeat;
-       }
-.menu-profile-list.events{
+       float: left;
+       height: 22px;
+   width: 22px;}
+.menu-profile-icon.events{
        background: url("../../../view/theme/diabook/icons/events.png") no-repeat;
-       }
-.menu-profile-list.notes{
+       float: left;
+       height: 22px;
+   width: 22px;}
+.menu-profile-icon.notes{
        background: url("../../../view/theme/diabook/icons/notes.png") no-repeat;
-       }
-.menu-profile-list.foren{
+       float: left;
+       height: 22px;
+   width: 22px;}
+.menu-profile-icon.foren{
        background: url("../../../view/theme/diabook/icons/pubgroups.png") no-repeat;
-       }
-.menu-profile-list.com_side{
+       float: left;
+       height: 22px;
+   width: 22px;}
+.menu-profile-icon.com_side{
        background: url("../../../view/theme/diabook/icons/com_side.png") no-repeat;
-       }
-.menu-profile-list.pscontacts{
+       float: left;
+       height: 22px;
+   width: 22px;}
+.menu-profile-icon.pscontacts{
        background: url("../../../view/theme/diabook/icons/pscontacts.png") no-repeat;
-       }
+       float: left;
+       height: 22px;
+   width: 22px;}
 
 /* aside */
 aside {

diff --git a/view/theme/diabook/style-profile.css b/view/theme/diabook/style-profile.css
index 51eb612533586813aacb7ed44601a906a457fcb4..31e1f056c6bbde11b34d3b599f81795dbd5eed5b 100644 (file)
--- a/view/theme/diabook/style-profile.css
+++ b/view/theme/diabook/style-profile.css
@@ -483,8 +483,9 @@ code {
 }
 #saved-search-ul .tool:hover,
 #nets-sidebar .tool:hover,
-#sidebar-group-list .tool:hover {
-       background: #EEE;
+#sidebar-group-list .tool:hover,
+#fileas-sidebar .tool:hover{
+       background: #E7F2F7;
 }
 .tool .label {
   float: left;
@@ -897,8 +898,6 @@ ul.menu-popup .empty {
 .menu-profile-list{
   height: auto;
   overflow: auto;
-  padding-top: 3px;
-  padding-bottom: 3px;
   padding-left: 16px;
   min-height: 16px;
   list-style: none;
@@ -908,28 +907,29 @@ ul.menu-popup .empty {
        }
 .menu-profile-list-item{
        padding-left: 5px;
+       vertical-align: middle;
        }       
 .menu-profile-list-item:hover{ 
        text-decoration: none;
    }
 /*http://prothemedesign.com/circular-icons/*/
-.menu-profile-list.home{
-       background: url("../../../view/theme/diabook-blue/icons/home.png") no-repeat;
+.menu-profile-icon.home{
+       background: url("../../../view/theme/diabook/icons/home.png") no-repeat;
        }
-.menu-profile-list.photos{
-       background: url("../../../view/theme/diabook-blue/icons/mess_side.png") no-repeat;
+.menu-profile-icon.photos{
+       background: url("../../../view/theme/diabook/icons/mess_side.png") no-repeat;
        }
-.menu-profile-list.events{
-       background: url("../../../view/theme/diabook-blue/icons/events.png") no-repeat;
+.menu-profile-icon.events{
+       background: url("../../../view/theme/diabook/icons/events.png") no-repeat;
        }
-.menu-profile-list.notes{
-       background: url("../../../view/theme/diabook-blue/icons/notes.png") no-repeat;
+.menu-profile-icon.notes{
+       background: url("../../../view/theme/diabook/icons/notes.png") no-repeat;
        }
-.menu-profile-list.foren{
-       background: url("../../../view/theme/diabook-blue/icons/pubgroups.png") no-repeat;
+.menu-profile-icon.foren{
+       background: url("../../../view/theme/diabook/icons/pubgroups.png") no-repeat;
        }
-.menu-profile-list.com_side{
-       background: url("../../../view/theme/diabook-blue/icons/com_side.png") no-repeat;
+.menu-profile-icon.com_side{
+       background: url("../../../view/theme/diabook/icons/com_side.png") no-repeat;
        }
 
 /* aside */

diff --git a/view/theme/diabook/style.css b/view/theme/diabook/style.css
index 7105ad0e37ce7690d44077bb23a9fb870ce072b2..23150a151fc29463f5bd23280e319c43e57a719b 100644 (file)
--- a/view/theme/diabook/style.css
+++ b/view/theme/diabook/style.css
@@ -529,8 +529,9 @@ code {
 }
 #saved-search-ul .tool:hover,
 #nets-sidebar .tool:hover,
-#sidebar-group-list .tool:hover {
-       background: #EEE;
+#sidebar-group-list .tool:hover,
+#fileas-sidebar .tool:hover {
+       background: #E7F2F7;
 }
 .tool .label {
   float: left;
@@ -1023,43 +1024,56 @@ ul.menu-popup .empty {
 .menu-profile-list{
   height: auto;
   overflow: auto;
-  padding-top: 3px;
-  padding-bottom: 3px;
-  padding-left: 16px;
   min-height: 16px;
   list-style: none;
        }
 .menu-profile-list:hover{
-       background: #EEE;
+       background: #E7F2F7;
        }
 .menu-profile-list-item{
        padding-left: 5px;
+       vertical-align: middle;
        }       
 .menu-profile-list-item:hover{ 
        text-decoration: none;
    }
 /*http://prothemedesign.com/circular-icons/*/
-.menu-profile-list.home{
-       background: url("../../../view/theme/diabook-blue/icons/home.png") no-repeat;
-       }
-.menu-profile-list.photos{
-       background: url("../../../view/theme/diabook-blue/icons/mess_side.png") no-repeat;
-       }
-.menu-profile-list.events{
-       background: url("../../../view/theme/diabook-blue/icons/events.png") no-repeat;
-       }
-.menu-profile-list.notes{
-       background: url("../../../view/theme/diabook-blue/icons/notes.png") no-repeat;
-       }
-.menu-profile-list.foren{
-       background: url("../../../view/theme/diabook-blue/icons/pubgroups.png") no-repeat;
-       }
-.menu-profile-list.com_side{
-       background: url("../../../view/theme/diabook-blue/icons/com_side.png") no-repeat;
+.menu-profile-icon.home{
+       background: url("../../../view/theme/diabook/icons/home.png") no-repeat;
+       float: left;
+       height: 22px;
+   width: 22px;
        }
-.menu-profile-list.pscontacts{
+.menu-profile-icon.photos{
+       background: url("../../../view/theme/diabook/icons/mess_side.png") no-repeat;
+       float: left;
+       height: 22px;
+   width: 22px;}
+.menu-profile-icon.events{
+       background: url("../../../view/theme/diabook/icons/events.png") no-repeat;
+       float: left;
+       height: 22px;
+   width: 22px;}
+.menu-profile-icon.notes{
+       background: url("../../../view/theme/diabook/icons/notes.png") no-repeat;
+       float: left;
+       height: 22px;
+   width: 22px;}
+.menu-profile-icon.foren{
+       background: url("../../../view/theme/diabook/icons/pubgroups.png") no-repeat;
+       float: left;
+       height: 22px;
+   width: 22px;}
+.menu-profile-icon.com_side{
+       background: url("../../../view/theme/diabook/icons/com_side.png") no-repeat;
+       float: left;
+       height: 22px;
+   width: 22px;}
+.menu-profile-icon.pscontacts{
        background: url("../../../view/theme/diabook/icons/pscontacts.png") no-repeat;
-       }
+       float: left;
+       height: 22px;
+   width: 22px;}
 
 /* aside */
 aside {