Merge pull request #186 from simonlnu/master

tweaking stuff in dispys. i thought i fixed the login screens, but they're b0rked right now.

diff --git a/view/theme/dispy-dark/style.css b/view/theme/dispy-dark/style.css
index 3616489992b6207c3c83cda6a40891c7a3ab5687..5dc0776e032fed5a9e59c8670e8ce82db7286898 100644 (file)
--- a/view/theme/dispy-dark/style.css
+++ b/view/theme/dispy-dark/style.css
@@ -1031,6 +1031,7 @@ section {
     font-size: 0.8em;
     padding-right: 230px;
        min-width: 475px;
+       width: 65%;
 }
 
 /** tabs **/
@@ -1161,10 +1162,18 @@ section {
     transition: all 1s ease-in-out;
 }
 .wall-item-subtools1 {
-       list-style: none;
+    height: 30px;
+    list-style: none outside none;
+    margin: 20px 0 30px -20px;
+    padding: 0;
+    width: 30px;
 }
 .wall-item-subtools2 {
-       list-style: none;
+    height: 25px;
+    list-style: none outside none;
+    margin: -75px 0 0 5px;
+    padding: 0;
+    width: 25px;
 }
 .wall-item-title {
        font-size: 1.2em;
@@ -1172,11 +1181,15 @@ section {
     margin-bottom: 1em;
 }
 .wall-item-body {
-       margin: 10px 10px 10px 0px;
+       margin: 20px 20px 10px 0px;
     text-align: left;
 }
 .wall-item-lock-wrapper {
        float: right;
+    height: 22px;
+    margin: 0 -5px 0 0;
+    width: 22px;
+       opacity: 1;
 }
 .wall-item-dislike,
 .wall-item-like {
@@ -2141,8 +2154,7 @@ div[id$="wrapper"] br {
        opacity: 0.1;
        filter:alpha(opacity=10);
        float: right;
-       margin-right: 10px;
-
+       margin-right: 5px;
 }
 .item-select:hover, .checkeditem {
        opacity: 1;

diff --git a/view/theme/dispy-dark/theme.php b/view/theme/dispy-dark/theme.php
index cebe9eb4fc2910bdd10951b8573ac2475e9f2491..7115faca15d5daabd042b2462ae68fcaeb7160a2 100644 (file)
--- a/view/theme/dispy-dark/theme.php
+++ b/view/theme/dispy-dark/theme.php
@@ -6,14 +6,9 @@
  * Version: 1.0
  * Author: Simon <http://simon.kisikew.org/>
  * Maintainer: Simon <http://simon.kisikew.org/>
- * Screenshot: <a href="screenshot.png">screenshot</a>
+ * Screenshot: <a href="screenshot.jpg">Screenshot</a>
  */
 
-
-$a->theme_info = array(
-       'extends' => 'dispy-dark'
-);
-
 $a->page['htmlhead'] .= <<< EOT
 <script>
 $(document).ready(function() {
@@ -111,20 +106,6 @@ $(document).ready(function() {
                $(this).css({color: '#eec'});
        });
 
-/*     $('#profile-photo-wrapper').mouseover(function() {
-               $('.profile-edit-side-div').css({display: 'block'});
-       }).mouseout(function() {
-               $('.profile-edit-side-div').css({display: 'none'});
-               return false;
-       });
-
-       $('img.photo').mouseover(function() {
-               $('.profile-edit-side-div').css({display: 'block'});
-       }).mouseout(function() {
-               $('.profile-edit-side-div').css({display: 'none'});
-               return false;
-       });*/
-
 });
 </script>
 EOT;
@@ -157,6 +138,6 @@ function dispydark_community_info() {
 }
 
 // aside on profile page
-if ($a->argv[0] === "profile") {
+if (($a->argv[0] . $a->argv[1]) === ("profile" . $a->user['nickname'])) {
        dispydark_community_info();
 }

diff --git a/view/theme/dispy-dark/wall_item.tpl b/view/theme/dispy-dark/wall_item.tpl
index 4b973bf93e32b2df4239dad1235cebdb570f5777..b54f753d3f661873f4014687b326a747b49c879a 100644 (file)
--- a/view/theme/dispy-dark/wall_item.tpl
+++ b/view/theme/dispy-dark/wall_item.tpl
@@ -16,11 +16,11 @@
                        <div class="wall-item-location" id="wall-item-location-$item.id">{{ if $item.location }}<span class="icon globe"></span>$item.location {{ endif }}</div>                                
                </div>
                <div class="wall-item-tools" id="wall-item-tools-$item.id">
-                       <ul class="wall-item-subtools1">
-                               <li class="wall-item-lock-wrapper">
+                               <div class="wall-item-lock-wrapper">
                                        {{ if $item.lock }}<div class="wall-item-lock"><img src="images/lock_icon.gif" class="lockview" alt="$item.lock" onclick="lockview(event,$item.id);" /></div>
                                        {{ else }}<div class="wall-item-lock"></div>{{ endif }}
-                               </li>
+                               </div>
+                       <ul class="wall-item-subtools1">
                                {{ if $item.star }}
                                <li>
                                        <a href="#" id="starred-$item.id" onclick="dostar($item.id); return false;" class="star-item icon $item.isstarred" title="$item.star.toggle"></a>
@@ -37,7 +37,7 @@
                                        <img id="like-rotator-$item.id" class="like-rotator" src="images/rotator.gif" alt="$item.wait" title="$item.wait" style="display: none;" />
                                </li>
                                {{ endif }}
-                       </ul>
+                       </ul><br style="clear:left;" />
                        <ul class="wall-item-subtools2">
                                {{ if $item.filer }}
                                <li><a href="#" id="filer-$item.id" onclick="itemFiler($item.id); return false;" class="filer-item icon file-as" title="$item.star.filer"></a></li>

diff --git a/view/theme/dispy/style.css b/view/theme/dispy/style.css
index c2c7467671b14db929512ed307f5e54c5508f4a1..1d6bba738d64ba08b4dfc7e9fa997b59b2ddce60 100644 (file)
--- a/view/theme/dispy/style.css
+++ b/view/theme/dispy/style.css
@@ -1031,6 +1031,7 @@ section {
     font-size: 0.8em;
     padding-right: 230px;
        min-width: 475px;
+       width: 65%;
 }
 
 /** tabs **/
@@ -1161,10 +1162,18 @@ section {
     transition: all 1s ease-in-out;
 }
 .wall-item-subtools1 {
-       list-style: none;
+    height: 30px;
+    list-style: none outside none;
+    margin: 20px 0 30px -20px;
+    padding: 0;
+    width: 30px;
 }
 .wall-item-subtools2 {
-       list-style: none;
+    height: 25px;
+    list-style: none outside none;
+    margin: -75px 0 0 5px;
+    padding: 0;
+    width: 25px;
 }
 .wall-item-title {
        font-size: 1.2em;
@@ -1172,11 +1181,15 @@ section {
     margin-bottom: 1em;
 }
 .wall-item-body {
-       margin: 10px 10px 10px 0px;
+       margin: 20px 20px 10px 0px;
     text-align: left;
 }
 .wall-item-lock-wrapper {
        float: right;
+    height: 22px;
+    margin: 0 -5px 0 0;
+    width: 22px;
+       opacity: 1;
 }
 .wall-item-dislike,
 .wall-item-like {
@@ -2142,7 +2155,6 @@ div[id$="wrapper"] br {
        filter:alpha(opacity=10);
        float: right;
        margin-right: 10px;
-
 }
 .item-select:hover, .checkeditem {
        opacity: 1;

diff --git a/view/theme/dispy/theme.php b/view/theme/dispy/theme.php
index 9789fd0fa3057c4986f404c0687c78561bfc0fd6..f3c54caf9eaf00beef3f45d26588bd25276d675c 100644 (file)
--- a/view/theme/dispy/theme.php
+++ b/view/theme/dispy/theme.php
@@ -9,11 +9,6 @@
  * Screenshot: <a href="screenshot.jpg">Screenshot</a>
  */
 
-
-$a->theme_info = array(
-       'extends' => 'dispy'
-);
-
 $a->page['htmlhead'] .= <<< EOT
 <script>
 $(document).ready(function() {
@@ -111,20 +106,6 @@ $(document).ready(function() {
                $(this).css({color: '#eec'});
        });
 
-/*     $('#profile-photo-wrapper').mouseover(function() {
-               $('.profile-edit-side-div').css({display: 'block'});
-       }).mouseout(function() {
-               $('.profile-edit-side-div').css({display: 'none'});
-               return false;
-       });
-
-       $('img.photo').mouseover(function() {
-               $('.profile-edit-side-div').css({display: 'block'});
-       }).mouseout(function() {
-               $('.profile-edit-side-div').css({display: 'none'});
-               return false;
-       });*/
-
 });
 </script>
 EOT;
@@ -157,6 +138,6 @@ function dispy_community_info() {
 }
 
 // aside on profile page
-if ($a->argv[0] === "profile") {
+if (($a->argv[0] . $a->argv[1]) === ("profile" . $a->user['nickname'])) {
        dispy_community_info();
 }

diff --git a/view/theme/dispy/wall_item.tpl b/view/theme/dispy/wall_item.tpl
index 4b973bf93e32b2df4239dad1235cebdb570f5777..b54f753d3f661873f4014687b326a747b49c879a 100644 (file)
--- a/view/theme/dispy/wall_item.tpl
+++ b/view/theme/dispy/wall_item.tpl
@@ -16,11 +16,11 @@
                        <div class="wall-item-location" id="wall-item-location-$item.id">{{ if $item.location }}<span class="icon globe"></span>$item.location {{ endif }}</div>                                
                </div>
                <div class="wall-item-tools" id="wall-item-tools-$item.id">
-                       <ul class="wall-item-subtools1">
-                               <li class="wall-item-lock-wrapper">
+                               <div class="wall-item-lock-wrapper">
                                        {{ if $item.lock }}<div class="wall-item-lock"><img src="images/lock_icon.gif" class="lockview" alt="$item.lock" onclick="lockview(event,$item.id);" /></div>
                                        {{ else }}<div class="wall-item-lock"></div>{{ endif }}
-                               </li>
+                               </div>
+                       <ul class="wall-item-subtools1">
                                {{ if $item.star }}
                                <li>
                                        <a href="#" id="starred-$item.id" onclick="dostar($item.id); return false;" class="star-item icon $item.isstarred" title="$item.star.toggle"></a>
@@ -37,7 +37,7 @@
                                        <img id="like-rotator-$item.id" class="like-rotator" src="images/rotator.gif" alt="$item.wait" title="$item.wait" style="display: none;" />
                                </li>
                                {{ endif }}
-                       </ul>
+                       </ul><br style="clear:left;" />
                        <ul class="wall-item-subtools2">
                                {{ if $item.filer }}
                                <li><a href="#" id="filer-$item.id" onclick="itemFiler($item.id); return false;" class="filer-item icon file-as" title="$item.star.filer"></a></li>