Merge commit 'upstream/master'

diff --git a/view/theme/diabook-aerith/style-network.css b/view/theme/diabook-aerith/style-network.css
index c1309313be57e210d6c32145b4dba2bf7c0bc8f2..3b461e6db032c4f894c67b3da28be27e95068b9a 100644 (file)
--- a/view/theme/diabook-aerith/style-network.css
+++ b/view/theme/diabook-aerith/style-network.css
@@ -1373,6 +1373,7 @@ transition: all 0.2s ease-in-out;
 
 .wall-item-container .wall-item-content img {
   max-width: 400px; 
+  max-height: 400px;
 }
 .wall-item-container .wall-item-links, .wall-item-container .wall-item-actions {
   display: table-cell;

diff --git a/view/theme/diabook-aerith/style-profile.css b/view/theme/diabook-aerith/style-profile.css
index 48134e124b54edaafdde97b1e107ea4a48391d38..73f46e9ee46a0fcda457d6570f4b94c0d8576297 100644 (file)
--- a/view/theme/diabook-aerith/style-profile.css
+++ b/view/theme/diabook-aerith/style-profile.css
@@ -1366,6 +1366,7 @@ transition: all 0.2s ease-in-out;
 
 .wall-item-container .wall-item-content img {
   max-width: 400px;
+  max-height: 400px;
 }
 .wall-item-container .wall-item-links, .wall-item-container .wall-item-actions {
   display: table-cell;

diff --git a/view/theme/diabook-blue/style-network.css b/view/theme/diabook-blue/style-network.css
index cba4c3f48528021c020bc5e9d9a6fd5f3a232938..bd1cb249cfe182161e0ee23716a2f96126527c3f 100644 (file)
--- a/view/theme/diabook-blue/style-network.css
+++ b/view/theme/diabook-blue/style-network.css
@@ -1335,6 +1335,7 @@ transition: all 0.2s ease-in-out;
 
 .wall-item-container .wall-item-content img {
   max-width: 400px; 
+  max-height: 400px;
 }
 .wall-item-container .wall-item-links, .wall-item-container .wall-item-actions {
   display: table-cell;

diff --git a/view/theme/diabook-blue/style-profile.css b/view/theme/diabook-blue/style-profile.css
index 3e9a47e6847b4df50e3e2e7c74dc081483d4252b..da826d74c97878763de7334a2818c380107bbbc7 100644 (file)
--- a/view/theme/diabook-blue/style-profile.css
+++ b/view/theme/diabook-blue/style-profile.css
@@ -1333,6 +1333,7 @@ transition: all 0.2s ease-in-out;
 
 .wall-item-container .wall-item-content img {
   max-width: 400px;
+  max-height: 400px;
 }
 .wall-item-container .wall-item-links, .wall-item-container .wall-item-actions {
   display: table-cell;

diff --git a/view/theme/diabook-red/style-network.css b/view/theme/diabook-red/style-network.css
index c91e1ff093b106f440bb5afb201f2487cc7af98e..efbec090a7840123ceab2029cffcd9e2581f8bf6 100644 (file)
--- a/view/theme/diabook-red/style-network.css
+++ b/view/theme/diabook-red/style-network.css
@@ -1370,6 +1370,7 @@ transition: all 0.2s ease-in-out;
 
 .wall-item-container .wall-item-content img {
   max-width: 400px; 
+  max-height: 400px;
 }
 .wall-item-container .wall-item-links, .wall-item-container .wall-item-actions {
   display: table-cell;

diff --git a/view/theme/diabook-red/style-profile.css b/view/theme/diabook-red/style-profile.css
index 4fd0803bd6e5fb5b05aaade7c363babcbc6ba1fd..ef6fd860162e5d87a515d268b8ff76290159c1fc 100644 (file)
--- a/view/theme/diabook-red/style-profile.css
+++ b/view/theme/diabook-red/style-profile.css
@@ -1346,6 +1346,7 @@ transition: all 0.2s ease-in-out;
 
 .wall-item-container .wall-item-content img {
   max-width: 400px;
+  max-height: 400px;
 }
 .wall-item-container .wall-item-links, .wall-item-container .wall-item-actions {
   display: table-cell;

diff --git a/view/theme/diabook/style-network.css b/view/theme/diabook/style-network.css
index ef30cd07b44474fa493125284fa81828d373d61f..af6e4027a17e7c206e29edda17fd1dec3b0c7508 100644 (file)
--- a/view/theme/diabook/style-network.css
+++ b/view/theme/diabook/style-network.css
@@ -1312,6 +1312,7 @@ transition: all 0.2s ease-in-out;
 
 .wall-item-container .wall-item-content img {
   max-width: 400px;
+  max-height: 400px;
 }
 .wall-item-container .wall-item-links, .wall-item-container .wall-item-actions {
   display: table-cell;

diff --git a/view/theme/diabook/style-profile.css b/view/theme/diabook/style-profile.css
index 9d6542ac2324c2010217593982f071f074b157ea..6b05903d3827c9350bca5f98b46c5d4a7ff89ee6 100644 (file)
--- a/view/theme/diabook/style-profile.css
+++ b/view/theme/diabook/style-profile.css
@@ -1306,6 +1306,7 @@ transition: all 0.2s ease-in-out;
 
 .wall-item-container .wall-item-content img {
   max-width: 400px;
+  max-height: 400px;
 }
 .wall-item-container .wall-item-links, .wall-item-container .wall-item-actions {
   display: table-cell;

diff --git a/view/theme/dispy-dark/nav.tpl b/view/theme/dispy-dark/nav.tpl
index e38b2bbe2f19853e5bb4ab591fe7d8b7c269ba8a..34aba50de3c724ac0a9d2d74fb13d576f4c3014e 100644 (file)
--- a/view/theme/dispy-dark/nav.tpl
+++ b/view/theme/dispy-dark/nav.tpl
@@ -56,7 +56,6 @@ works -->
         <a id="nav-register-link" class="nav-commlink $nav.register.2" href="$nav.register.0" title="$nav.register.1"></a>
         </li>
         {{ endif }}
-
         {{ if $nav.contacts }}
         <li><a id="nav-contacts-link" class="nav-commlink $nav.contacts.2" href="$nav.contacts.0" title="$nav.contacts.1">$nav.contacts.1</a></li>
         {{ endif }}
@@ -75,11 +74,9 @@ works -->
         {{ if $nav.admin }}
         <li><a id="nav-admin-link" class="nav-commlink $nav.admin.2" href="$nav.admin.0" title="$nav.admin.1">$nav.admin.1</a></li>
         {{ endif }}
-
         {{ if $nav.login }}
         <li><a id="nav-login-link" class="nav-commlink $nav.login.2" href="$nav.login.0" title="$nav.login.1">$nav.login.1</a></li>
         {{ endif }}
-
         {{ if $nav.logout }}
         <li><a id="nav-logout-link" class="nav-commlink $nav.logout.2" href="$nav.logout.0" title="$nav.logout.3" >$nav.logout.1</a></li>
         {{ endif }}

diff --git a/view/theme/dispy-dark/style.css b/view/theme/dispy-dark/style.css
index 30d5cb8a9c1dcd049145c771faf4886fabf32ed4..a3248c13c2547fd6e4178fee1a7e1b6ed5e55d0e 100644 (file)
--- a/view/theme/dispy-dark/style.css
+++ b/view/theme/dispy-dark/style.css
@@ -63,8 +63,8 @@ option {
        color: #eec;
        background: #2e2f2e;
 }
-li {
-       padding: 0 0 0 2px;
+ul, ol {
+       padding: 0;
 }
 /* remember to define focus styles! */
 :focus {
@@ -2603,7 +2603,8 @@ div[id$="wrapper"] br {
 }
 .icon.drop,
 .icon.drophide, .icon.delete {
-    float: left;
+    float: right;
+       margin: 5px;
 }
 .icon.s22.delete {
        display: block;

diff --git a/view/theme/dispy-dark/theme.php b/view/theme/dispy-dark/theme.php
index 17d31feda25ad03d4247d7c84dba0f8b3100ea3e..e1dc8ba0c6531f8443d6318df216332ed208c813 100644 (file)
--- a/view/theme/dispy-dark/theme.php
+++ b/view/theme/dispy-dark/theme.php
@@ -9,6 +9,10 @@
  * Screenshot: <a href="screenshot.jpg">Screenshot</a>
  */
 
+$a->theme_info = array(
+       'extends' => 'dispy-dark',
+);
+
 $a->page['htmlhead'] .= <<< EOT
 <script>
 $(document).ready(function() {

diff --git a/view/theme/dispy-dark/wall_item.tpl b/view/theme/dispy-dark/wall_item.tpl
index 8acaeaf02767505b85ee82f520be93621e69801f..52af07532b7edf9fb2a0581b953371087de203ac 100644 (file)
--- a/view/theme/dispy-dark/wall_item.tpl
+++ b/view/theme/dispy-dark/wall_item.tpl
@@ -4,9 +4,7 @@
                        <div class="wall-item-photo-wrapper" id="wall-item-photo-wrapper-$item.id" 
                                 onmouseover="if (typeof t$item.id != 'undefined') clearTimeout(t$item.id); openMenu('wall-item-photo-menu-button-$item.id')" 
                                 onmouseout="t$item.id=setTimeout('closeMenu(\'wall-item-photo-menu-button-$item.id\'); closeMenu(\'wall-item-photo-menu-$item.id\');',200)">
-                               <a href="$item.profile_url" target="redir" title="$item.linktitle" class="wall-item-photo-link" id="wall-item-photo-link-$item.id">
-                                       <img src="$item.thumb" class="wall-item-photo$item.sparkle" id="wall-item-photo-$item.id" style="height: 80px; width: 80px;" alt="$item.name" />
-                               </a>
+                               <a href="$item.profile_url" target="redir" title="$item.linktitle" class="wall-item-photo-link" id="wall-item-photo-link-$item.id"><img src="$item.thumb" class="wall-item-photo$item.sparkle" id="wall-item-photo-$item.id" style="height: 80px; width: 80px;" alt="$item.name" /></a>
                                <span onclick="openClose('wall-item-photo-menu-$item.id');" class="fakelink wall-item-photo-menu-button" id="wall-item-photo-menu-button-$item.id">menu</span>
                                <div class="wall-item-photo-menu" id="wall-item-photo-menu-$item.id">
                                        <ul>
@@ -57,15 +55,16 @@
                        </ul>
                        <div class="wall-item-delete-end"></div>
                </div>
-               <div class="wall-item-content" id="wall-item-content-$item.id" >
+               <div class="wall-item-content" id="wall-item-content-$item.id">
                        <div class="wall-item-title" id="wall-item-title-$item.id">$item.title</div>
                        <div class="wall-item-title-end"></div>
-                       <div class="wall-item-body" id="wall-item-body-$item.id" >$item.body
-                                       <div class="body-tag">
-                                               {{ for $item.tags as $tag }}
-                                                       <span class='tag'>$tag</span>
-                                               {{ endfor }}
-                                       </div>
+                       <div class="wall-item-body" id="wall-item-body-$item.id">
+                               $item.body
+                               <div class="body-tag">
+                                       {{ for $item.tags as $tag }}
+                                               <span class='tag'>$tag</span>
+                                       {{ endfor }}
+                               </div>
                        </div>
                </div>
                <div class="wall-item-author">

diff --git a/view/theme/dispy-dark/wallwall_item.tpl b/view/theme/dispy-dark/wallwall_item.tpl
index 421cddadfc0fbe80c9747fb3d32b3f34f278c400..e8cbc2cd40314c59c6fe2e4d89c2b169ece2ce06 100644 (file)
--- a/view/theme/dispy-dark/wallwall_item.tpl
+++ b/view/theme/dispy-dark/wallwall_item.tpl
@@ -2,15 +2,13 @@
        <div class="wall-item-content-wrapper$item.indent" id="wall-item-content-wrapper-$item.id" >
                <div class="wall-item-info wallwall" id="wall-item-info-$item.id">
                        <div class="wall-item-photo-wrapper wwto" id="wall-item-ownerphoto-wrapper-$item.id" >
-                               <a href="$item.owner_url" title="$item.olinktitle" class="wall-item-photo-link" id="wall-item-ownerphoto-link-$item.id">
-                               <img src="$item.owner_photo" class="wall-item-photo$item.osparkle" id="wall-item-ownerphoto-$item.id" style="height: 80px; width: 80px;" alt="$item.owner_name" /></a>
+                               <a href="$item.owner_url" title="$item.olinktitle" class="wall-item-photo-link" id="wall-item-ownerphoto-link-$item.id"><img src="$item.owner_photo" class="wall-item-photo$item.osparkle" id="wall-item-ownerphoto-$item.id" style="height: 80px; width: 80px;" alt="$item.owner_name" /></a>
                        </div>
                        <div class="wall-item-arrowphoto-wrapper" ><img src="images/larrow.gif" alt="$item.wall" /></div>
                        <div class="wall-item-photo-wrapper wwfrom" id="wall-item-photo-wrapper-$item.id" 
                                onmouseover="if (typeof t$item.id != 'undefined') clearTimeout(t$item.id); openMenu('wall-item-photo-menu-button-$item.id')"
                 onmouseout="t$item.id=setTimeout('closeMenu(\'wall-item-photo-menu-button-$item.id\'); closeMenu(\'wall-item-photo-menu-$item.id\');',200)">
-                               <a href="$item.profile_url" title="$item.linktitle" class="wall-item-photo-link" id="wall-item-photo-link-$item.id">
-                               <img src="$item.thumb" class="wall-item-photo$item.sparkle" id="wall-item-photo-$item.id" style="height: 80px; width: 80px;" alt="$item.name" /></a>
+                               <a href="$item.profile_url" title="$item.linktitle" class="wall-item-photo-link" id="wall-item-photo-link-$item.id"><img src="$item.thumb" class="wall-item-photo$item.sparkle" id="wall-item-photo-$item.id" style="height: 80px; width: 80px;" alt="$item.name" /></a>
                                <span onclick="openClose('wall-item-photo-menu-$item.id');" class="fakelink wall-item-photo-menu-button" id="wall-item-photo-menu-button-$item.id">menu</span>
                 <div class="wall-item-photo-menu" id="wall-item-photo-menu-$item.id">
                     <ul>
@@ -63,15 +61,16 @@ class="icon recycle wall-item-share-buttons"  title="$item.vote.share.0" onclick
                        </ul>
                        <div class="wall-item-delete-end"></div>
                </div>
-               <div class="wall-item-content" id="wall-item-content-$item.id" >
+               <div class="wall-item-content" id="wall-item-content-$item.id">
                        <div class="wall-item-title" id="wall-item-title-$item.id">$item.title</div>
                        <div class="wall-item-title-end"></div>
-                       <div class="wall-item-body" id="wall-item-body-$item.id" >$item.body
-                                       <div class="body-tag">
-                                               {{ for $item.tags as $tag }}
-                                                       <span class="tag">$tag</span>
-                                               {{ endfor }}
-                                       </div>                  
+                       <div class="wall-item-body" id="wall-item-body-$item.id">
+                               $item.body
+                               <div class="body-tag">
+                                       {{ for $item.tags as $tag }}
+                                               <span class="tag">$tag</span>
+                                       {{ endfor }}
+                               </div>                  
                        </div>
                </div>
                <div class="wall-item-author">

diff --git a/view/theme/dispy/style.css b/view/theme/dispy/style.css
index f8287c6ec77faacd2e098ea93c5a9037c44ecd03..622cf57341642498ed60fe91ce831b82d1482a06 100644 (file)
--- a/view/theme/dispy/style.css
+++ b/view/theme/dispy/style.css
@@ -63,8 +63,8 @@ option {
        color: #222;
        background: #efefef;
 }
-li {
-       padding: 0 0 0 2px;
+ul, ol {
+       padding: 0;
 }
 /* remember to define focus styles! */
 :focus {
@@ -2603,7 +2603,8 @@ div[id$="wrapper"] br {
 }
 .icon.drop,
 .icon.drophide, .icon.delete {
-    float: left;
+    float: right;
+       margin: 5px;
 }
 .icon.s22.delete {
        display: block;

diff --git a/view/theme/dispy/theme.php b/view/theme/dispy/theme.php
index f3c54caf9eaf00beef3f45d26588bd25276d675c..d0f6797cbaa92c617dfc1f55f4b2c02a768b750c 100644 (file)
--- a/view/theme/dispy/theme.php
+++ b/view/theme/dispy/theme.php
@@ -9,6 +9,10 @@
  * Screenshot: <a href="screenshot.jpg">Screenshot</a>
  */
 
+$a->theme_info = array(
+       'extends' => 'dispy',
+);
+
 $a->page['htmlhead'] .= <<< EOT
 <script>
 $(document).ready(function() {