Merge pull request #118 from tomtom84/master

fixes in diabook-derivates

5 files changed, 20 insertions, 6 deletions

diff --git a/view/theme/diabook/icons/notifications.png b/view/theme/diabook/icons/notifications.png
index 5bdc34f76..270997740 100755
--- a/view/theme/diabook/icons/notifications.png
+++ b/view/theme/diabook/icons/notifications.png
diff --git a/view/theme/diabook/style.css b/view/theme/diabook/style.css
index 6e3909ab4..ad7119c2a 100644
--- 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 0a20c9fbc..5a1828ad7 100755
--- 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 b1a014949..ebe40fd4e 100644
--- 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 603a908c5..e02e5a8be 100644
--- 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">