fixed login-fields, fixed. notofication.png, changed locations

diff --git a/view/theme/diabook-blue/icons/notifications.png b/view/theme/diabook-blue/icons/notifications.png
index 33ae95c6a0c78c4e71a5b6da79c48040c1aae1cc..c23673dbd09fe07a2a17a34bb70d472043922501 100755 (executable)
Binary files a/view/theme/diabook-blue/icons/notifications.png and b/view/theme/diabook-blue/icons/notifications.png differ

diff --git a/view/theme/diabook-blue/style.css b/view/theme/diabook-blue/style.css
index 7f5fe1fecf7317a68febc5a6b2eb9378bfe10877..51b173f2a93fc4df364a10baffb3c163972cecec 100644 (file)
--- a/view/theme/diabook-blue/style.css
+++ b/view/theme/diabook-blue/style.css
@@ -652,6 +652,17 @@ nav .nav-menu-icon {
   -webkit-border-radius: 5px 5px 0 0;
   border-radius: 5px 5px 0 0;
 }
+nav .nav-menu-icon:hover {
+  background-color: #308dbf;  
+  position: relative;
+  height: 22px;
+  padding: 5px;
+  margin: 0px 7px;
+  -moz-border-radius: 5px 5px 0 0;
+  -webkit-border-radius: 5px 5px 0 0;
+  border-radius: 5px 5px 0 0;
+}
+
 nav .nav-menu-icon.selected {
   background-color: #fff;
 }
@@ -1037,13 +1048,22 @@ section {
   width: 800px;
   padding: 0px 0px 0px 12px;
 }
+#id_username {
+  width: 173px;        
+       }
+#id_password {
+  width: 173px;                
+       }
+#id_openid_url {
+  width: 173px;        
+       }
 #contact-edit-end {
-  margin-top: 140%;
        }
 .pager {
    padding: 10px;
        text-align: center;
        font-size: 1.0em;
+       margin-top: 140%;
 }      
 
 .tabs {
@@ -1075,6 +1095,10 @@ section {
   margin-bottom: 0px;
   width: 775px;
 }
+.tread-wrapper a{
+  color: #1872A2;
+}
+
 .wall-item-decor {
   position: absolute;
   left: 790px;
@@ -1118,6 +1142,7 @@ section {
 }
 .wall-item-container .wall-item-location {
   padding-right: 40px;
+  display: table-cell;
 }
 .wall-item-container .wall-item-ago {
   word-wrap: break-word;
@@ -1173,6 +1198,7 @@ section {
 .wall-item-container .wall-item-actions-social {
   float: left;
   margin-bottom: 1px;
+  display: table-cell;
 }
 .wall-item-container .wall-item-actions-social a {
   margin-right: 1em;
@@ -1183,6 +1209,7 @@ section {
 .wall-item-container .wall-item-actions-tools {
   float: right;
   width: 80px;
+  display: table-cell;done
 }
 .wall-item-container .wall-item-actions-tools a {
   float: right;

diff --git a/view/theme/diabook-blue/wall_item.tpl b/view/theme/diabook-blue/wall_item.tpl
index b1a0149490bda6983e3e5a701cac9198f28890c8..ebe40fd4ea095f2e0b20cab4bdd4109d4f525d0b 100644 (file)
--- a/view/theme/diabook-blue/wall_item.tpl
+++ b/view/theme/diabook-blue/wall_item.tpl
@@ -46,7 +46,7 @@
 
                </div>
                <div class="wall-item-actions">
-                       <div class="wall-item-location">$item.location&nbsp;</div>
+
                        <div class="wall-item-actions-social">
                        
                        
@@ -82,7 +82,7 @@
                                        <a class="icon pencil" href="$item.edpost.0" title="$item.edpost.1"></a>
                                {{ endif }}
                        </div>
-                       
+                       <div class="wall-item-location">$item.location&nbsp;</div>
                </div>
        </div>
        <div class="wall-item-bottom">

diff --git a/view/theme/diabook-blue/wallwall_item.tpl b/view/theme/diabook-blue/wallwall_item.tpl
index 603a908c5a5e948cab98754adfca82837dda2187..e02e5a8becc6ca942cb40daaa9c46572cb562d66 100644 (file)
--- a/view/theme/diabook-blue/wallwall_item.tpl
+++ b/view/theme/diabook-blue/wallwall_item.tpl
@@ -52,7 +52,7 @@
 
                </div>
                <div class="wall-item-actions">
-                       <div class="wall-item-location">$item.location&nbsp;</div>
+
                        <div class="wall-item-actions-social">
                        
                        
@@ -88,7 +88,7 @@
                                        <a class="icon pencil" href="$item.edpost.0" title="$item.edpost.1"></a>
                                {{ endif }}
                        </div>
-                       
+                       <div class="wall-item-location">$item.location&nbsp;</div>
                </div>
        </div>
        <div class="wall-item-bottom">

diff --git a/view/theme/diabook/icons/notifications.png b/view/theme/diabook/icons/notifications.png
index 5bdc34f7648dde8433ab9c76c621915da1efb7b6..2709977406afc940f8e7a3376db1c6828aa2b151 100755 (executable)
Binary files a/view/theme/diabook/icons/notifications.png and b/view/theme/diabook/icons/notifications.png differ

diff --git a/view/theme/diabook/style.css b/view/theme/diabook/style.css
index 6e3909ab4fbaf51a5821cb019abd308940cdb8d5..ad7119c2aa5e2cd4862524ac8b6bd9dacd14868f 100644 (file)
--- a/view/theme/diabook/style.css
+++ b/view/theme/diabook/style.css
@@ -1036,13 +1036,23 @@ section {
   width: 800px;
   padding: 0px 0px 0px 12px;
 }
+#id_username {
+  width: 173px;        
+       }
+#id_password {
+  width: 173px;                
+       }
+#id_openid_url {
+  width: 173px;        
+       }
 #contact-edit-end {
-  margin-top: 140%;
+   
        }
 .pager {
    padding: 10px;
        text-align: center;
        font-size: 1.0em;
+       margin-top: 140%;
 }      
 .tabs {
     
@@ -1116,6 +1126,7 @@ section {
 }
 .wall-item-container .wall-item-location {
   padding-right: 40px;
+  display: table-cell;
 }
 .wall-item-container .wall-item-ago {
   word-wrap: break-word;
@@ -1171,6 +1182,7 @@ section {
 .wall-item-container .wall-item-actions-social {
   float: left;
   margin-bottom: 1px;
+  display: table-cell;
 }
 .wall-item-container .wall-item-actions-social a {
   margin-right: 1em;
@@ -1181,6 +1193,7 @@ section {
 .wall-item-container .wall-item-actions-tools {
   float: right;
   width: 80px;
+  display: table-cell;
 }
 .wall-item-container .wall-item-actions-tools a {
   float: right;

diff --git a/view/theme/diabook/theme.php b/view/theme/diabook/theme.php
index 0a20c9fbca22f52f7fb1f2238c527ee04263890f..5a1828ad75e26d062ea11f0299f02f4050607b49 100755 (executable)
--- a/view/theme/diabook/theme.php
+++ b/view/theme/diabook/theme.php
@@ -13,6 +13,7 @@ $a->theme_info = array(
 
 $a->page['htmlhead'] .= <<< EOT
 <script>
+
 //contacts
 $('html').click(function() {
  $('#nav-contacts-linkmenu').removeClass('selected');
@@ -62,5 +63,5 @@ $('html').click(function() {
  $('#nav-site-linkmenu').click(function(event){
      event.stopPropagation();
  });
-</script>
+</script> 
 EOT;

diff --git a/view/theme/diabook/wall_item.tpl b/view/theme/diabook/wall_item.tpl
index b1a0149490bda6983e3e5a701cac9198f28890c8..ebe40fd4ea095f2e0b20cab4bdd4109d4f525d0b 100644 (file)
--- a/view/theme/diabook/wall_item.tpl
+++ b/view/theme/diabook/wall_item.tpl
@@ -46,7 +46,7 @@
 
                </div>
                <div class="wall-item-actions">
-                       <div class="wall-item-location">$item.location&nbsp;</div>
+
                        <div class="wall-item-actions-social">
                        
                        
@@ -82,7 +82,7 @@
                                        <a class="icon pencil" href="$item.edpost.0" title="$item.edpost.1"></a>
                                {{ endif }}
                        </div>
-                       
+                       <div class="wall-item-location">$item.location&nbsp;</div>
                </div>
        </div>
        <div class="wall-item-bottom">

diff --git a/view/theme/diabook/wallwall_item.tpl b/view/theme/diabook/wallwall_item.tpl
index 603a908c5a5e948cab98754adfca82837dda2187..e02e5a8becc6ca942cb40daaa9c46572cb562d66 100644 (file)
--- a/view/theme/diabook/wallwall_item.tpl
+++ b/view/theme/diabook/wallwall_item.tpl
@@ -52,7 +52,7 @@
 
                </div>
                <div class="wall-item-actions">
-                       <div class="wall-item-location">$item.location&nbsp;</div>
+
                        <div class="wall-item-actions-social">
                        
                        
@@ -88,7 +88,7 @@
                                        <a class="icon pencil" href="$item.edpost.0" title="$item.edpost.1"></a>
                                {{ endif }}
                        </div>
-                       
+                       <div class="wall-item-location">$item.location&nbsp;</div>
                </div>
        </div>
        <div class="wall-item-bottom">