Merge remote branch 'upstream/master'

author: Michael <icarus@dabo.de> 2012-04-11 18:48:58 +0200
committer: Michael <icarus@dabo.de> 2012-04-11 18:48:58 +0200
commit: 39405c8056b4a1d55c97fb2963d8776695dbeb30 (patch)
tree: c9f89ba0e9aacee343cf50b6b8a64468bb8db694 /view/theme/dispy
parent: c3139fa0fd49b0b4de4568d46a6946c75ccb2a62 (diff)
parent: cdb6510b9f3007d2afd3081313caa7d045af1e7c (diff)
download: volse-hubzilla-39405c8056b4a1d55c97fb2963d8776695dbeb30.tar.gz
volse-hubzilla-39405c8056b4a1d55c97fb2963d8776695dbeb30.tar.bz2
volse-hubzilla-39405c8056b4a1d55c97fb2963d8776695dbeb30.zip
7 files changed, 196 insertions, 172 deletions
diff --git a/view/theme/dispy/communityhome.tpl b/view/theme/dispy/communityhome.tpl
index 340b7216c..edabab611 100644
--- a/view/theme/dispy/communityhome.tpl
+++ b/view/theme/dispy/communityhome.tpl
@@ -37,10 +37,8 @@
 </div>
 {{ endif }}
 
-{{ if $lastusers_title }}
-<h3 id="postit-header">PostIt to Friendica</h3>
+<h3 id="postit-header">'PostIt' to Friendica</h3>
 <div id="postit">
 <a href="$fostitJS" title="PostIt">Post to Friendica</a> from anywhere by bookmarking this link.
 </div>
-{{ endif }}
 
diff --git a/view/theme/dispy/default.php b/view/theme/dispy/default.php
index e74ec1a4f..32393f08d 100644
--- a/view/theme/dispy/default.php
+++ b/view/theme/dispy/default.php
@@ -6,15 +6,31 @@
   <?php if(x($page,'htmlhead')) echo $page['htmlhead'] ?>
 </head>
 <body>
-	<?php if(x($page,'nav')) echo $page['nav']; ?>
-	<aside>
-		<?php if(x($page,'aside')) echo $page['aside']; ?>
-		<?php if(x($page,'aside_bottom')) echo $page['aside_bottom']; ?>
-	</aside>
-	<section><?php if(x($page,'content')) echo $page['content']; ?>
-		<div id="page-footer"></div>
-	</section>
-	<footer><?php if(x($page,'footer')) echo $page['footer']; ?></footer>
+	<header>
+	<!-- header stuff will go here -->
+	</header>
+	<article id="articlemain">
+		<?php if(x($page,'nav')) echo $page['nav']; ?>
+		<aside id="asideleft">
+			<?php if(x($page,'aside_left')) echo $page['aside_left']; ?>
+			<?php if(x($page,'aside_left_bottom')) echo $page['aside_left_bottom']; ?>
+		</aside>
+		<section id="sectionmain">
+			<?php if(x($page,'content')) echo $page['content']; ?>
+			<footer id="section-footer"></footer>
+		</section>
+		<aside id="asidemain">
+			<?php if(x($page,'aside')) echo $page['aside']; ?>
+			<?php if(x($page,'aside_bottom')) echo $page['aside_bottom']; ?>
+		</aside>
+		<aside id="asideright">
+			<?php if(x($page,'aside_right')) echo $page['aside_right']; ?>
+			<?php if(x($page,'aside_right_bottom')) echo $page['aside_right_bottom']; ?>
+		</aside>
+	</article>
+	<footer id="page-footer">
+		<?php if(x($page,'footer')) echo $page['footer']; ?>
+	</footer>
 </body>
 </html>
 
diff --git a/view/theme/dispy/nav.tpl b/view/theme/dispy/nav.tpl
index e38b2bbe2..34aba50de 100644
--- a/view/theme/dispy/nav.tpl
+++ b/view/theme/dispy/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/style.css b/view/theme/dispy/style.css
index 622cf5734..70d722e81 100644
--- a/view/theme/dispy/style.css
+++ b/view/theme/dispy/style.css
@@ -1,7 +1,8 @@
 /*
  * dispy
  *
- * modernised, sort of, by simon <http://simon.kisikew.org/>
+ * maintainer: simon <http://simon.kisikew.org/>
+ * author: unknown
  *
  */
 
@@ -210,12 +211,17 @@ input[type=submit] {
 	margin: 5px 0;
 	list-style: none;
 }
+#articlemain {
+	width: 100%;
+	height: 100%;
+	margin: 0 auto;
+}
 
 
 /**
  * 	login
  */
-aside .field {
+#asidemain .field {
 	overflow: hidden;
 	width: 200px;
 }
@@ -247,7 +253,7 @@ aside .field {
 #login-submit-button {
     margin-left: 0px !important;
 }
-aside #login_openid {
+#asidemain #login_openid {
 	position: relative !important;
 	float: none !important;
 	margin-left: 0px !important;
@@ -268,13 +274,10 @@ aside #login_openid {
  */
 nav {
 	height: 60px;
-	display: block;
 	background-color: #2e3436;
 	color: #eeeeec;
 	position: relative;
 	padding: 20px 20px 10px 95px;
-    margin-left: auto;
-    margin-right: auto;
 }
 nav a {
 	text-decoration: none;
@@ -707,12 +710,16 @@ nav #nav-notifications-linkmenu.on .icon.s22.notify, nav #nav-notifications-link
 /**
 * aside
 **/
-aside {
-    position: absolute;
-    right: 15px;
-    width: 245px;
-	padding-top: 15px;
+#asidemain {
+	float: left;
     font-size: smaller;
+    margin: 20px 0 20px 35px;
+    width: 25%;
+	display: inline;
+}
+/* for now, disappear these */
+#asideright, #asideleft {
+	display: none;
 }
 .vcard .fn {
 	font-size: 1.7em;
@@ -742,15 +749,15 @@ aside {
 .vcard #profile-photo-wrapper img {
 	box-shadow: 3px 3px 10px 0 #000;
 }
-aside h4 {
+#asidemain h4 {
 	font-size: 1.2em;
 }
-aside #viewcontacts {
+#asidemain #viewcontacts {
 	text-align: right;
 }
 .aprofile dt {
-    color: #666666;
 	background: transparent;
+	color: #666666;
 	font-weight: bold;
     box-shadow: 1px 1px 5px 0 #000;
     margin: 15px 0 5px;
@@ -1064,12 +1071,13 @@ aside #viewcontacts {
 /**
  * section
  */
-section {
-    margin: 20px 9% 0 4%;
+#sectionmain {
+    margin: 20px;
     font-size: 0.8em;
-    padding-right: 230px;
 	min-width: 475px;
-	width: 65%;
+	width: 67%;
+	float: left;
+	display: inline;
 }
 
 /** tabs **/
@@ -1333,19 +1341,19 @@ section {
     width: 100%;
 }
 #connect-services-header {
-
+	margin: 5px 0 0 0;
 }
 #connect-services {
 	margin: 5px 0 0 0;
 }
 #extra-help-header {
-
+	margin: 5px 0 0 0;
 }
 #extra-help {
 	margin: 5px 0 0 0;
 }
 #postit-header {
-
+	margin: 5px 0 0 0;
 }
 #postit {
 	margin: 5px 0 0 0;
@@ -2603,8 +2611,8 @@ div[id$="wrapper"] br {
 }
 .icon.drop,
 .icon.drophide, .icon.delete {
-    float: right;
-	margin: 5px;
+    float: left;
+	/*margin: 5px;*/
 }
 .icon.s22.delete {
 	display: block;
@@ -2776,7 +2784,7 @@ div[id$="wrapper"] br {
 }
 footer {
     display: block;
-    margin: 50px 20%;
+	/*margin: 50px 20%;*/
     clear: both;
 }
 #profile-jot-text {
diff --git a/view/theme/dispy/theme.php b/view/theme/dispy/theme.php
index d0f6797cb..5df193aa6 100644
--- a/view/theme/dispy/theme.php
+++ b/view/theme/dispy/theme.php
@@ -3,122 +3,135 @@
 /*
  * Name: Dispy
  * Description: Dispy, Friendica theme
- * Version: 1.0
+ * Version: 1.1
  * Author: unknown
  * Maintainer: Simon <http://simon.kisikew.org/>
  * Screenshot: <a href="screenshot.jpg">Screenshot</a>
  */
 
+$a = get_app();
 $a->theme_info = array(
-	'extends' => 'dispy',
+	'name' => 'dispy',
+	'version' => '1.1'
 );
 
-$a->page['htmlhead'] .= <<< EOT
-<script>
-$(document).ready(function() {
-    $('.group-edit-icon').hover(
-        function() {
-            $(this).addClass('icon');
-            $(this).removeClass('iconspacer'); },
-
-        function() {
-            $(this).removeClass('icon');
-            $(this).addClass('iconspacer'); }
-    );
-
-    $('.sidebar-group-element').hover(
-        function() {
-            id = $(this).attr('id');
-            $('#edit-' + id).addClass('icon');
-            $('#edit-' + id).removeClass('iconspacer'); },
-
-        function() {
-            id = $(this).attr('id');
-            $('#edit-' + id).removeClass('icon');
-            $('#edit-' + id).addClass('iconspacer'); }
-    );
-
-    $('.savedsearchdrop').hover(
-        function() {
-            $(this).addClass('drop');
-            $(this).addClass('icon');
-            $(this).removeClass('iconspacer'); },
-
-        function() {
-            $(this).removeClass('drop');
-            $(this).removeClass('icon');
-            $(this).addClass('iconspacer'); }
-    );
-
-    $('.savedsearchterm').hover(
-        function() {
-            id = $(this).attr('id');
-            $('#drop-' + id).addClass('icon');
-            $('#drop-' + id).addClass('drophide');
-            $('#drop-' + id).removeClass('iconspacer'); },
-
-        function() {
-            id = $(this).attr('id');
-            $('#drop-' + id).removeClass('icon');
-            $('#drop-' + id).removeClass('drophide');
-            $('#drop-' + id).addClass('iconspacer'); }
-        );
-
-	// click outside notifications menu closes it
-	$('html').click(function() {
-		$('#nav-notifications-linkmenu').removeClass('selected');
-		document.getElementById("nav-notifications-menu").style.display = "none";
-	});
-
-	$('#nav-notifications-linkmenu').click(function(event) {
-		event.stopPropagation();
-	});
-	// click outside profiles menu closes it
-	$('html').click(function() {
-		$('#profiles-menu-trigger').removeClass('selected');
-		document.getElementById("profiles-menu").style.display = "none";
-	});
-
-	$('#profiles-menu').click(function(event) {
-		event.stopPropagation();
-	});
+function dispy_init(&$a) {
+
+	// aside on profile page
+	if (($a->argv[0] . $a->argv[1]) === ("profile" . $a->user['nickname'])) {
+		dispy_community_info();
+	}
+
+	$a->page['htmlhead'] .= <<<EOT
+	<script type="text/javascript">
+	$(document).ready(function() {
+		$('.group-edit-icon').hover(
+			function() {
+				$(this).addClass('icon');
+				$(this).removeClass('iconspacer'); },
+
+			function() {
+				$(this).removeClass('icon');
+				$(this).addClass('iconspacer'); }
+		);
+
+		$('.sidebar-group-element').hover(
+			function() {
+				id = $(this).attr('id');
+				$('#edit-' + id).addClass('icon');
+				$('#edit-' + id).removeClass('iconspacer'); },
+
+			function() {
+				id = $(this).attr('id');
+				$('#edit-' + id).removeClass('icon');
+				$('#edit-' + id).addClass('iconspacer'); }
+		);
+
+		$('.savedsearchdrop').hover(
+			function() {
+				$(this).addClass('drop');
+				$(this).addClass('icon');
+				$(this).removeClass('iconspacer'); },
+
+			function() {
+				$(this).removeClass('drop');
+				$(this).removeClass('icon');
+				$(this).addClass('iconspacer'); }
+		);
+
+		$('.savedsearchterm').hover(
+			function() {
+				id = $(this).attr('id');
+				$('#drop-' + id).addClass('icon');
+				$('#drop-' + id).addClass('drophide');
+				$('#drop-' + id).removeClass('iconspacer'); },
+
+			function() {
+				id = $(this).attr('id');
+				$('#drop-' + id).removeClass('icon');
+				$('#drop-' + id).removeClass('drophide');
+				$('#drop-' + id).addClass('iconspacer'); }
+			);
+
+		// click outside notifications menu closes it
+		$('html').click(function() {
+			$('#nav-notifications-linkmenu').removeClass('selected');
+			document.getElementById("nav-notifications-menu").style.display = "none";
+		});
+
+		$('#nav-notifications-linkmenu').click(function(event) {
+			event.stopPropagation();
+		});
+		// click outside profiles menu closes it
+		$('html').click(function() {
+			$('#profiles-menu-trigger').removeClass('selected');
+			document.getElementById("profiles-menu").style.display = "none";
+		});
+
+		$('#profiles-menu').click(function(event) {
+			event.stopPropagation();
+		});
+
+		// main function in toolbar functioning
+		function toggleToolbar() {
+			if ( $('#nav-floater').is(':visible') ) {
+				$('#nav-floater').slideUp('fast');
+				$('.floaterflip').css({
+					backgroundPosition: '-210px -60px' 
+				});
+				$('.search-box').slideUp('fast');
+			} else {
+				$('#nav-floater').slideDown('fast');
+				$('.floaterflip').css({
+					backgroundPosition: '-190px -60px'
+				});
+				$('.search-box').slideDown('fast');
+			}
+		};
+		// our trigger for the toolbar button
+		$('.floaterflip').click(function() {
+			toggleToolbar();
+			return false;
+		});
+
+		// (attempt) to change the text colour in a top post
+		$('#profile-jot-text').focusin(function() {
+			$(this).css({color: '#eec'});
+		});
 
-	// main function in toolbar functioning
-    function toggleToolbar() {
-        if ( $('#nav-floater').is(':visible') ) {
-            $('#nav-floater').slideUp('fast');
-            $('.floaterflip').css({
-                backgroundPosition: '-210px -60px' 
-            });
-			$('.search-box').slideUp('fast');
-        } else {
-            $('#nav-floater').slideDown('fast');
-            $('.floaterflip').css({
-                backgroundPosition: '-190px -60px'
-            });
-			$('.search-box').slideDown('fast');
-        }
-    };
-	// our trigger for the toolbar button
-    $('.floaterflip').click(function() {
-        toggleToolbar();
-        return false;
-    });
-
-	// (attempt) to change the text colour in a top post
-	$('#profile-jot-text').focusin(function() {
-		$(this).css({color: '#eec'});
 	});
-
-});
-</script>
+	</script>
 EOT;
+}
 
 function dispy_community_info() {
 	$a = get_app();
+	$url = $a->get_baseurl($ssl_state);
+	$aside['$url'] = $url;
 
-	$fostitJS = "javascript: (function() {
-		the_url = '".$a->get_baseurl($ssl_state)."/view/theme/dispy-dark/fpostit/fpostit.php?url=' +
+	$fpostitJS = <<<FPI
+		javascript: (function() {
+		the_url = ' . $url . '/view/theme/' . $a->theme_info['name'] . '/fpostit/fpostit.php?url=' +
 		encodeURIComponent(window.location.href) + '&title=' + encodeURIComponent(document.title) + '&text=' +
 		encodeURIComponent(''+(window.getSelection ? window.getSelection() : document.getSelection ?
 		document.getSelection() : document.selection.createRange().text));
@@ -131,17 +144,11 @@ function dispy_community_info() {
 			} else {
 				a_funct();
 			}
-		})();";
+		})();
+FPI;
 
-	$aside['$fostitJS'] = $fostitJS;
-	$url = $a->get_baseurl($ssl_state);
-	$aside['$url'] = $url;
-
-    $tpl = file_get_contents(dirname(__file__).'/communityhome.tpl');
-	$a->page['aside_bottom'] = replace_macros($tpl, $aside);
+	$aside['$fpostitJS'] = $fpostitJS;
+	$tpl = file_get_contents(dirname(__file__) . '/communityhome.tpl');
+	return $a->page['aside_bottom'] = replace_macros($tpl, $aside);
 }
 
-// aside on profile page
-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 8acaeaf02..52af07532 100644
--- a/view/theme/dispy/wall_item.tpl
+++ b/view/theme/dispy/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/wallwall_item.tpl b/view/theme/dispy/wallwall_item.tpl
index 421cddadf..e8cbc2cd4 100644
--- a/view/theme/dispy/wallwall_item.tpl
+++ b/view/theme/dispy/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">
author	Michael <icarus@dabo.de>	2012-04-11 18:48:58 +0200
committer	Michael <icarus@dabo.de>	2012-04-11 18:48:58 +0200
commit	39405c8056b4a1d55c97fb2963d8776695dbeb30 (patch)
tree	c9f89ba0e9aacee343cf50b6b8a64468bb8db694 /view/theme/dispy
parent	c3139fa0fd49b0b4de4568d46a6946c75ccb2a62 (diff)
parent	cdb6510b9f3007d2afd3081313caa7d045af1e7c (diff)
download	volse-hubzilla-39405c8056b4a1d55c97fb2963d8776695dbeb30.tar.gz volse-hubzilla-39405c8056b4a1d55c97fb2963d8776695dbeb30.tar.bz2 volse-hubzilla-39405c8056b4a1d55c97fb2963d8776695dbeb30.zip