added icons to profile_side, fixes in css

diff --git a/view/theme/diabook-blue/icons/com_side.png b/view/theme/diabook-blue/icons/com_side.png
new file mode 100644 (file)
index 0000000..bc5969e
Binary files /dev/null and b/view/theme/diabook-blue/icons/com_side.png differ

diff --git a/view/theme/diabook-blue/icons/events.png b/view/theme/diabook-blue/icons/events.png
new file mode 100644 (file)
index 0000000..4a0b3f3
Binary files /dev/null and b/view/theme/diabook-blue/icons/events.png differ

diff --git a/view/theme/diabook-blue/icons/home.png b/view/theme/diabook-blue/icons/home.png
new file mode 100644 (file)
index 0000000..be47a48
Binary files /dev/null and b/view/theme/diabook-blue/icons/home.png differ

diff --git a/view/theme/diabook-blue/icons/mess_side.png b/view/theme/diabook-blue/icons/mess_side.png
new file mode 100644 (file)
index 0000000..49ef896
Binary files /dev/null and b/view/theme/diabook-blue/icons/mess_side.png differ

diff --git a/view/theme/diabook-blue/icons/notes.png b/view/theme/diabook-blue/icons/notes.png
new file mode 100644 (file)
index 0000000..7d4afca
Binary files /dev/null and b/view/theme/diabook-blue/icons/notes.png differ

diff --git a/view/theme/diabook-blue/icons/pubgroups.png b/view/theme/diabook-blue/icons/pubgroups.png
new file mode 100644 (file)
index 0000000..acf857f
Binary files /dev/null and b/view/theme/diabook-blue/icons/pubgroups.png differ

diff --git a/view/theme/diabook-blue/photo_album.tpl b/view/theme/diabook-blue/photo_album.tpl
new file mode 100755 (executable)
index 0000000..7e6c2f6
--- /dev/null
+++ b/view/theme/diabook-blue/photo_album.tpl
@@ -0,0 +1,7 @@
+<div class="photo-album-image-wrapper" id="photo-album-image-wrapper-$id">
+       <a href="$imgsrc" rel="gallery" class="fancy-album" id="photo-album-photo-link-$id" title="$phototitle">
+               <img src="$imgsrc" alt="$imgalt" title="$phototitle" class="photo-album-photo lframe  resize" id="photo-album-photo-$id" />
+               <p class='caption'>$desc</p>            
+       </a>
+</div>
+<div class="photo-album-image-wrapper-end"></div>

diff --git a/view/theme/diabook-blue/photo_top.tpl b/view/theme/diabook-blue/photo_top.tpl
new file mode 100755 (executable)
index 0000000..98ac9c4
--- /dev/null
+++ b/view/theme/diabook-blue/photo_top.tpl
@@ -0,0 +1,7 @@
+
+<div class="photo-top-image-wrapper lframe" id="photo-top-image-wrapper-$id">
+       <a href="$photo.src" rel="$photo.album.name" class="fancy-album" id="photo-top-photo-link-$photo.id" title="$photo.title">
+               <img src="$photo.src" alt="$photo.alt" title="$photo.title" class="photo-top-album-img" id="photo-top-photo-$photo.id" />
+       </a>
+       <div class="photo-top-album-name"><a href="$photo.album.link" class="photo-top-album-link" title="$photo.album.alt" >$photo.album.name</a></div>
+</div>

diff --git a/view/theme/diabook-blue/photo_view.tpl b/view/theme/diabook-blue/photo_view.tpl
index 511fc73acba577a935796c2f43499495c66d282e..902c2a0ed30451889c398ee6fa09565d771da5c1 100755 (executable)
--- a/view/theme/diabook-blue/photo_view.tpl
+++ b/view/theme/diabook-blue/photo_view.tpl
@@ -12,7 +12,7 @@
 
 <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>
+       <a href="$photo.href" class="fancy-photo" 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>
 

diff --git a/view/theme/diabook-blue/profile_side.tpl b/view/theme/diabook-blue/profile_side.tpl
index 01da55ce1c76b023416d0e91e8cfa1b93ae0b760..a65677696a6e46a0de98f8f7a6dbdb074f44d6d3 100644 (file)
--- a/view/theme/diabook-blue/profile_side.tpl
+++ b/view/theme/diabook-blue/profile_side.tpl
@@ -7,12 +7,12 @@
        </div>
        
 <ul id="profile-side-menu" class="menu-profile-side">
-       <li id="profile-side-status" class="menu-profile-list"><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"><a class="menu-profile-list-item" href="$ps.usermenu.photos.0">$ps.usermenu.photos.1</a></li>
-       <li id="profile-side-events" class="menu-profile-list"><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"><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"><a class="menu-profile-list-item" href="http://dir.friendika.com/directory/forum" target="blanc">Public Groups</a></li>
-       <li id="profile-side-foren" class="menu-profile-list"><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 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-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="http://dir.friendika.com/directory/forum" target="blanc">Public Groups</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>
 </ul>
 
 </div>

diff --git a/view/theme/diabook-blue/style.css b/view/theme/diabook-blue/style.css
index bdc79a350d4655e011812742840e1e1720fae353..738dde0e5d7242826de5f22f0494ac93c3079be2 100644 (file)
--- a/view/theme/diabook-blue/style.css
+++ b/view/theme/diabook-blue/style.css
@@ -891,22 +891,47 @@ ul.menu-popup .empty {
   text-decoration: none;       
        }
 .menu-profile-side{
-       list-style: none;       
-  padding-left: 16px;
-  min-height: 16px;
+  list-style: none;    
+  padding-left: 0px;
+  min-height: 0px;
        }
 .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;
        }
+.menu-profile-list-item{
+       padding-left: 5px;
+       }       
 .menu-profile-list-item:hover{ 
-       text-decoration: none;  
+       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;
+       }
 /* aside */
 aside {
   display: table-cell;
@@ -1066,6 +1091,16 @@ aside #side-peoplefind-url {
   min-height: 16px;
   list-style: none;
 }
+#side-bar-photos-albums li{
+list-style-type: disc;
+}
+#side-bar-photos-albums ul li{
+  margin-left: 30px;
+  padding-left: 0px;
+       }
+#side-bar-photos-albums ul li a{
+  color: #1872A2;
+}
 .widget .tool.selected {
   background: url("../../../view/theme/diabook-blue/icons/selected.png") no-repeat left center;
 }
@@ -2207,6 +2242,9 @@ a.mail-list-link {
 .calendar {
         font-family: Courier, monospace;
 }
+.calendar.eventcal a {
+  color: #1872A2;      
+       }
 .today {
         font-weight: bold;
         color: #FF0000;
@@ -2380,6 +2418,9 @@ float: left;
   padding-bottom: 20px;
   position: relative;
   margin: 0 10px 10px 0;
+  overflow: hidden;
+  float: left;
+  position: relative;
 }
 .photo-top-album-name {
   position: absolute;
@@ -2388,6 +2429,9 @@ float: left;
 }
 .photo-top-album-link{
   color: #1872A2;
+       }
+.photo-top-album-img{
+       
        }
 /*.photo-top-image-wrapper {
         position: relative;

diff --git a/view/theme/diabook-blue/theme.php b/view/theme/diabook-blue/theme.php
index 9093ac2ca229abe9497a5ca3c19c77e27d817fc9..f9128ea1fd5424ef6a319bf4b394a346fa58c22c 100755 (executable)
--- a/view/theme/diabook-blue/theme.php
+++ b/view/theme/diabook-blue/theme.php
@@ -11,9 +11,9 @@ $a->theme_info = array(
   'extends' => 'diabook',
 );
 
-//profile_side
-
+//fancybox: provide $photo.href to photo_top.tpl to img in org. scale
 
+//profile_side
 
 $nav['usermenu']=array();
 $userinfo = null;
@@ -110,10 +110,15 @@ $('html').click(function() {
      event.stopPropagation();
  });
  
- $(function() {
-       $('a.lightbox').fancybox(); // Select all links with lightbox class
+
+
+ $(document).ready(function() {
+       $("a.fancy-photo").fancybox(); // Select all links with lightbox class 
+       $("a.fancy-album").fancybox();
 });
 
+
+
  
  </script>
 EOT;

diff --git a/view/theme/diabook/style.css b/view/theme/diabook/style.css
index b7568631ff057c6f5af95c72503e8e609879d0ff..437f323faa568b2f183cd69fa5ad089acab49cfc 100644 (file)
--- a/view/theme/diabook/style.css
+++ b/view/theme/diabook/style.css
@@ -485,9 +485,6 @@ code {
 #sidebar-group-list .tool:hover {
        background: #EEE;
 }
-#sidebar-pages-list .tool:hover {
-       background: #EEE;
-}
 .tool .label {
   float: left;
 }
@@ -1337,14 +1334,14 @@ body .pageheader{
 }
 .tag {
   /*background: url("../../../images/tag_b.png") repeat-x center left;*/
-  color: #999;
+  color: #3465A4;
   padding-left: 3px;
   font-size: 12px;
 }
 .tag a {
   padding-right: 5px;
   /*background: url("../../../images/tag.png") no-repeat center right;*/
-  color: #999;
+  color: #3465A4;
 }
 .wwto {
   position: absolute !important;

diff --git a/view/theme/diabook/wall_item.tpl b/view/theme/diabook/wall_item.tpl
index 321bbbe9ea6d6e169b30b10590846bc3274ef6e7..ebe40fd4ea095f2e0b20cab4bdd4109d4f525d0b 100644 (file)
--- a/view/theme/diabook/wall_item.tpl
+++ b/view/theme/diabook/wall_item.tpl
@@ -13,8 +13,7 @@
                                <a href="$item.profile_url" target="redir" title="$item.linktitle" class="contact-photo-link" id="wall-item-photo-link-$item.id">
                                        <img src="$item.thumb" class="contact-photo$item.sparkle" id="wall-item-photo-$item.id" alt="$item.name" />
                                </a>
-                               <a href="#" rel="#wall-item-photo-menu-$item.id" class="contact-photo-menu-button icon s16 menu" 
-id="wall-item-photo-menu-button-$item.id">menu</a>
+                               <a href="#" rel="#wall-item-photo-menu-$item.id" class="contact-photo-menu-button icon s16 menu" id="wall-item-photo-menu-button-$item.id">menu</a>
                                <ul class="contact-menu menu-popup" id="wall-item-photo-menu-$item.id">
                                $item.item_photo_menu
                                </ul>
@@ -22,8 +21,7 @@ id="wall-item-photo-menu-button-$item.id">menu</a>
                        </div>
                </div>
                        <div class="wall-item-actions-author">
-                               <a href="$item.profile_url" target="redir" title="$item.linktitle" class="wall-item-name-link"><span 
-class="wall-item-name$item.sparkle">$item.name</span></a> 
+                               <a href="$item.profile_url" target="redir" title="$item.linktitle" class="wall-item-name-link"><span class="wall-item-name$item.sparkle">$item.name</span></a> 
                        <span class="wall-item-ago">-
                        {{ if $item.plink }}<a class="link" title="$item.plink.title" href="$item.plink.href" style="color: #999">$item.ago</a>{{ else }} $item.ago {{ endif }}
                        {{ if $item.lock }} - <span class="fakelink" style="color: #999" onclick="lockview(event,$item.id);">$item.lock</span> {{ endif }}
@@ -97,4 +95,3 @@ class="wall-item-name$item.sparkle">$item.name</span></a>
 <div class="wall-item-comment-wrapper" >
        $item.comment
 </div>
-

diff --git a/view/theme/diabook/wallwall_item.tpl b/view/theme/diabook/wallwall_item.tpl
index 05ed4cc82cc98721902fc982e18609cb333f6a33..e02e5a8becc6ca942cb40daaa9c46572cb562d66 100644 (file)
--- a/view/theme/diabook/wallwall_item.tpl
+++ b/view/theme/diabook/wallwall_item.tpl
@@ -18,8 +18,7 @@
                                <a href="$item.profile_url" target="redir" title="$item.linktitle" class="contact-photo-link" id="wall-item-photo-link-$item.id">
                                        <img src="$item.thumb" class="contact-photo$item.sparkle" id="wall-item-photo-$item.id" alt="$item.name" />
                                </a>
-                               <a href="#" rel="#wall-item-photo-menu-$item.id" class="contact-photo-menu-button icon s16 menu" 
-id="wall-item-photo-menu-button-$item.id">menu</a>
+                               <a href="#" rel="#wall-item-photo-menu-$item.id" class="contact-photo-menu-button icon s16 menu" id="wall-item-photo-menu-button-$item.id">menu</a>
                                <ul class="contact-menu menu-popup" id="wall-item-photo-menu-$item.id">
                                $item.item_photo_menu
                                </ul>
@@ -27,10 +26,8 @@ id="wall-item-photo-menu-button-$item.id">menu</a>
                        </div>
                </div>
                        <div class="wall-item-actions-author">
-                               <a href="$item.profile_url" target="redir" title="$item.linktitle" class="wall-item-name-link"><span 
-class="wall-item-name$item.sparkle">$item.name</span></a>
-                               $item.to <a href="$item.owner_url" target="redir" title="$item.olinktitle" class="wall-item-name-link"><span class="wall-item-name$item.osparkle" 
-id="wall-item-ownername-$item.id">$item.owner_name</span></a>
+                               <a href="$item.profile_url" target="redir" title="$item.linktitle" class="wall-item-name-link"><span class="wall-item-name$item.sparkle">$item.name</span></a>
+                               $item.to <a href="$item.owner_url" target="redir" title="$item.olinktitle" class="wall-item-name-link"><span class="wall-item-name$item.osparkle" id="wall-item-ownername-$item.id">$item.owner_name</span></a>
                                 $item.vwall <span class="wall-item-ago">- &nbsp;
                        {{ if $item.plink }}<a class="link" title="$item.plink.title" href="$item.plink.href" style="color: #999">$item.ago</a>{{ else }} $item.ago {{ endif }}
                        {{ if $item.lock }} - <span class="fakelink" style="color: #999" onclick="lockview(event,$item.id);">$item.lock</span> {{ endif }}
@@ -103,4 +100,4 @@ id="wall-item-ownername-$item.id">$item.owner_name</span></a>
 
 <div class="wall-item-comment-wrapper" >
        $item.comment
-</div>
+</div>
\ No newline at end of file