aboutsummaryrefslogtreecommitdiffstats
path: root/view/theme/diabook-blue
diff options
context:
space:
mode:
Diffstat (limited to 'view/theme/diabook-blue')
-rw-r--r--view/theme/diabook-blue/js/README22
-rw-r--r--view/theme/diabook-blue/js/jquery.ae.image.resize.js69
-rw-r--r--view/theme/diabook-blue/js/jquery.ae.image.resize.min.js1
-rw-r--r--view/theme/diabook-blue/nav.tpl4
-rw-r--r--view/theme/diabook-blue/photo_item.tpl65
-rwxr-xr-xview/theme/diabook-blue/photo_view.tpl9
-rw-r--r--view/theme/diabook-blue/profile_vcard.tpl2
-rw-r--r--view/theme/diabook-blue/style-network.css21
-rw-r--r--view/theme/diabook-blue/style-profile.css20
-rw-r--r--view/theme/diabook-blue/style.css154
-rwxr-xr-xview/theme/diabook-blue/theme.php27
11 files changed, 369 insertions, 25 deletions
diff --git a/view/theme/diabook-blue/js/README b/view/theme/diabook-blue/js/README
new file mode 100644
index 000000000..c93b2118e
--- /dev/null
+++ b/view/theme/diabook-blue/js/README
@@ -0,0 +1,22 @@
+jQuery Resize Plugin Demo
+
+Version: v2.1.1
+Author: Adeel Ejaz (http://adeelejaz.com/)
+License: Dual licensed under MIT and GPL licenses.
+
+Introduction
+aeImageResize is a jQuery plugin to dynamically resize the images without distorting the proportions.
+
+Usage:
+.aeImageResize( height, width )
+
+height
+An integer representing the maximum height for the image.
+
+width
+An integer representing the maximum width for the image.
+
+Example
+$(function() {
+ $( ".resizeme" ).aeImageResize({ height: 250, width: 250 });
+}); \ No newline at end of file
diff --git a/view/theme/diabook-blue/js/jquery.ae.image.resize.js b/view/theme/diabook-blue/js/jquery.ae.image.resize.js
new file mode 100644
index 000000000..bac09cd45
--- /dev/null
+++ b/view/theme/diabook-blue/js/jquery.ae.image.resize.js
@@ -0,0 +1,69 @@
+(function( $ ) {
+
+ $.fn.aeImageResize = function( params ) {
+
+ var aspectRatio = 0
+ // Nasty I know but it's done only once, so not too bad I guess
+ // Alternate suggestions welcome :)
+ , isIE6 = $.browser.msie && (6 == ~~ $.browser.version)
+ ;
+
+ // We cannot do much unless we have one of these
+ if ( !params.height && !params.width ) {
+ return this;
+ }
+
+ // Calculate aspect ratio now, if possible
+ if ( params.height && params.width ) {
+ aspectRatio = params.width / params.height;
+ }
+
+ // Attach handler to load
+ // Handler is executed just once per element
+ // Load event required for Webkit browsers
+ return this.one( "load", function() {
+
+ // Remove all attributes and CSS rules
+ this.removeAttribute( "height" );
+ this.removeAttribute( "width" );
+ this.style.height = this.style.width = "";
+
+ var imgHeight = this.height
+ , imgWidth = this.width
+ , imgAspectRatio = imgWidth / imgHeight
+ , bxHeight = params.height
+ , bxWidth = params.width
+ , bxAspectRatio = aspectRatio;
+
+ // Work the magic!
+ // If one parameter is missing, we just force calculate it
+ if ( !bxAspectRatio ) {
+ if ( bxHeight ) {
+ bxAspectRatio = imgAspectRatio + 1;
+ } else {
+ bxAspectRatio = imgAspectRatio - 1;
+ }
+ }
+
+ // Only resize the images that need resizing
+ if ( (bxHeight && imgHeight > bxHeight) || (bxWidth && imgWidth > bxWidth) ) {
+
+ if ( imgAspectRatio > bxAspectRatio ) {
+ bxHeight = ~~ ( imgHeight / imgWidth * bxWidth );
+ } else {
+ bxWidth = ~~ ( imgWidth / imgHeight * bxHeight );
+ }
+
+ this.height = bxHeight;
+ this.width = bxWidth;
+ }
+ })
+ .each(function() {
+
+ // Trigger load event (for Gecko and MSIE)
+ if ( this.complete || isIE6 ) {
+ $( this ).trigger( "load" );
+ }
+ });
+ };
+})( jQuery ); \ No newline at end of file
diff --git a/view/theme/diabook-blue/js/jquery.ae.image.resize.min.js b/view/theme/diabook-blue/js/jquery.ae.image.resize.min.js
new file mode 100644
index 000000000..16c30b123
--- /dev/null
+++ b/view/theme/diabook-blue/js/jquery.ae.image.resize.min.js
@@ -0,0 +1 @@
+(function(d){d.fn.aeImageResize=function(a){var i=0,j=d.browser.msie&&6==~~d.browser.version;if(!a.height&&!a.width)return this;if(a.height&&a.width)i=a.width/a.height;return this.one("load",function(){this.removeAttribute("height");this.removeAttribute("width");this.style.height=this.style.width="";var e=this.height,f=this.width,g=f/e,b=a.height,c=a.width,h=i;h||(h=b?g+1:g-1);if(b&&e>b||c&&f>c){if(g>h)b=~~(e/f*c);else c=~~(f/e*b);this.height=b;this.width=c}}).each(function(){if(this.complete||j)d(this).trigger("load")})}})(jQuery); \ No newline at end of file
diff --git a/view/theme/diabook-blue/nav.tpl b/view/theme/diabook-blue/nav.tpl
index 3b78b5995..fd29d9309 100644
--- a/view/theme/diabook-blue/nav.tpl
+++ b/view/theme/diabook-blue/nav.tpl
@@ -22,7 +22,7 @@
<span class="icon contacts">$nav.contacts.1</span>
<span id="intro-update" class="nav-notify"></span></a>
<ul id="nav-contacts-menu" class="menu-popup">
- <li id="nav-contacts-see-intro"><a href="$nav.notifications.0">$nav.introductions.1</a><span id="intro-update" class="nav-notify"></span></li>
+ <li id="nav-contacts-see-intro"><a href="$nav.notifications.0">$nav.introductions.1</a><span id="intro-update-li" class="nav-notify"></span></li>
<li id="nav-contacts-all"><a href="contacts">$nav.contacts.1</a></li>
</ul>
</li>
@@ -35,7 +35,7 @@
<span id="mail-update" class="nav-notify"></span></a>
<ul id="nav-messages-menu" class="menu-popup">
<li id="nav-messages-see-all"><a href="$nav.messages.0">$nav.messages.1</a></li>
- <li id="nav-messages-see-all"><a href="$nav.messages.inbox.0">$nav.messages.inbox.1</a></li>
+ <li id="nav-messages-see-all"><a href="$nav.messages.inbox.0">$nav.messages.inbox.1</a><span id="mail-update-li" class="nav-notify"></span></li>
<li id="nav-messages-see-all"><a href="$nav.messages.outbox.0">$nav.messages.outbox.1</a></li>
<li id="nav-messages-see-all"><a href="$nav.messages.new.0">$nav.messages.new.1</a></li>
</ul>
diff --git a/view/theme/diabook-blue/photo_item.tpl b/view/theme/diabook-blue/photo_item.tpl
new file mode 100644
index 000000000..5d65a89b7
--- /dev/null
+++ b/view/theme/diabook-blue/photo_item.tpl
@@ -0,0 +1,65 @@
+{{ if $indent }}{{ else }}
+<div class="wall-item-decor">
+ <img id="like-rotator-$id" class="like-rotator" src="images/rotator.gif" alt="$wait" title="$wait" style="display: none;" />
+</div>
+{{ endif }}
+
+<div class="wall-item-photo-container $indent">
+ <div class="wall-item-item">
+ <div class="wall-item-info">
+ <div class="contact-photo-wrapper" >
+ <a href="$profile_url" target="redir" title="" class="contact-photo-link" id="wall-item-photo-link-$id">
+ <img src="$thumb" class="contact-photo$sparkle" id="wall-item-photo-$id" alt="$name" />
+ </a>
+ <a href="#" rel="#wall-item-photo-menu-$id" class="contact-photo-menu-button icon s16 menu" id="wall-item-photo-menu-button-$id">menu</a>
+ <ul class="contact-menu menu-popup" id="wall-item-photo-menu-$id">
+ $photo_menu
+ </ul>
+
+ </div>
+ </div>
+ <div class="wall-item-actions-author">
+ <a href="$profile_url" target="redir" title="$name" class="wall-item-name-link"><span class="wall-item-name$sparkle">$name</span></a>
+ <span class="wall-item-ago">-
+ {{ if $plink }}<a class="link" title="$plink.title" href="$plink.href" style="color: #999">$ago</a>{{ else }} $ago {{ endif }}
+ {{ if $lock }} - <span class="fakelink" style="color: #999" onclick="lockview(event,$id);">$lock</span> {{ endif }}
+ </span>
+ </div>
+ <div class="wall-item-content">
+ {{ if $title }}<h2><a href="$plink.href">$title</a></h2>{{ endif }}
+ $body
+ </div>
+ </div>
+ <div class="wall-item-bottom">
+ <div class="wall-item-links">
+ </div>
+ <div class="wall-item-tags">
+ {{ for $tags as $tag }}
+ <span class='tag'>$tag</span>
+ {{ endfor }}
+ </div>
+ </div>
+
+ <div class="wall-item-bottom" style="display: table-row;">
+ <div class="wall-item-actions">
+ </div>
+ <div class="wall-item-actions">
+
+ <div class="wall-item-actions-tools">
+
+ {{ if $drop.dropping }}
+ <input type="checkbox" title="$drop.select" name="itemselected[]" class="item-select" value="$id" />
+ <a href="item/drop/$id" onclick="return confirmDelete();" class="icon drop" title="$drop.delete">$drop.delete</a>
+ {{ endif }}
+ {{ if $edpost }}
+ <a class="icon pencil" href="$edpost.0" title="$edpost.1"></a>
+ {{ endif }}
+ </div>
+
+ </div>
+ </div>
+ <div class="wall-item-bottom">
+
+ </div>
+</div>
+
diff --git a/view/theme/diabook-blue/photo_view.tpl b/view/theme/diabook-blue/photo_view.tpl
index 20926656a..93b01d623 100755
--- a/view/theme/diabook-blue/photo_view.tpl
+++ b/view/theme/diabook-blue/photo_view.tpl
@@ -26,3 +26,12 @@
{{ if $edit }}$edit{{ endif }}
+<div style="margin-top:20px">
+</div>
+<div id="wall-photo-container">
+$comments
+</div>
+
+$paginate
+
+
diff --git a/view/theme/diabook-blue/profile_vcard.tpl b/view/theme/diabook-blue/profile_vcard.tpl
index e28ec2909..6fcffcc9b 100644
--- a/view/theme/diabook-blue/profile_vcard.tpl
+++ b/view/theme/diabook-blue/profile_vcard.tpl
@@ -22,7 +22,7 @@
- <div id="profile-photo-wrapper"><img class="photo" width="155" height="155" src="$profile.photo?rev=$profile.picdate" alt="$profile.name" /></div>
+ <div id="profile-photo-wrapper"><img class="photo" src="$profile.photo?rev=$profile.picdate" alt="$profile.name" /></div>
{{ if $pdesc }}<div class="title">$profile.pdesc</div>{{ endif }}
diff --git a/view/theme/diabook-blue/style-network.css b/view/theme/diabook-blue/style-network.css
index 991b19849..bd1cb249c 100644
--- a/view/theme/diabook-blue/style-network.css
+++ b/view/theme/diabook-blue/style-network.css
@@ -1199,7 +1199,6 @@ body .pageheader{
padding: 0;
}
.tab.button {
- margin-right: 5px;
margin-left: 5px;
/*background: none repeat scroll 0 0 #F8F8F8;*/
border: 1px solid #CCCCCC;
@@ -1331,10 +1330,12 @@ transition: all 0.2s ease-in-out;
max-width: 420px;
word-wrap: break-word;
line-height: 1.2;
+ margin-bottom: 14px;
}
.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;
@@ -1431,9 +1432,9 @@ transition: all 0.2s ease-in-out;
border: 1px solid #2d2d2d;
}
.comment-edit-preview {
- width: 710px;
- border: 1px solid #2d2d2d;
+ width: 500px;
margin-top: 10px;
+ background-color: #fff797;
}
.comment-edit-preview .contact-photo {
width: 32px;
@@ -1669,7 +1670,7 @@ transition: all 0.2s ease-in-out;
height: 20px;
margin: 0 0 5px;
width: 60%;
- border: 1px solid #ffffff;
+ border: 1px solid #d2d2d2;
}
#profile-jot-form #jot-title:-webkit-input-placeholder {
font-weight: normal;
@@ -2054,9 +2055,10 @@ ul.tabs li .active {
/* photo */
.photo {
box-shadow: 2px 2px 5px 0px #000000;
-margin: 2px 5px 2px 5px;
-max-height: 85%;
-max-width: 85%;
+margin: 0px;
+border-radius: 10px;
+height: 145px !important;
+width: 145px !important;
}
.lframe {
float: left;
@@ -2129,6 +2131,11 @@ blockquote {
border-left: 1px solid #D2D2D2;
padding-left: 9px;
margin: 0 0 0 .8ex;
+ color: #777;
+}
+.oembed {
+ font-size: large;
+ font-weight: bold;
}
.aprofile dt{
box-shadow: 1px 1px 5px 0;
diff --git a/view/theme/diabook-blue/style-profile.css b/view/theme/diabook-blue/style-profile.css
index fca29d088..da826d74c 100644
--- a/view/theme/diabook-blue/style-profile.css
+++ b/view/theme/diabook-blue/style-profile.css
@@ -1198,7 +1198,6 @@ body .pageheader{
padding: 0;
}
.tab.button {
- margin-right: 5px;
margin-left: 5px;
/*background: none repeat scroll 0 0 #F8F8F8;*/
border: 1px solid #CCCCCC;
@@ -1329,10 +1328,12 @@ transition: all 0.2s ease-in-out;
max-width: 420px;
word-wrap: break-word;
line-height: 1.2;
+ margin-bottom: 14px;
}
.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;
@@ -1426,9 +1427,9 @@ transition: all 0.2s ease-in-out;
border: 1px solid #2d2d2d;
}
.comment-edit-preview {
- width: 710px;
- border: 1px solid #2d2d2d;
+ width: 500px;
margin-top: 10px;
+ background-color: #fff797;
}
.comment-edit-preview .contact-photo {
width: 32px;
@@ -1664,7 +1665,7 @@ transition: all 0.2s ease-in-out;
height: 20px;
margin: 0 0 5px;
width: 60%;
- border: 1px solid #ffffff;
+ border: 1px solid #d2d2d2;
}
#profile-jot-form #jot-title:-webkit-input-placeholder {
font-weight: normal;
@@ -2049,10 +2050,10 @@ ul.tabs li .active {
/* photo */
.photo {
box-shadow: 2px 2px 5px 0px #000000;
-margin: 2px 5px 2px 5px;
-max-height: 85%;
-max-width: 85%;
+margin: 0px;
border-radius: 10px;
+height: 145px !important;
+width: 145px !important;
}
.lframe {
float: left;
@@ -2125,6 +2126,11 @@ blockquote {
border-left: 1px solid #D2D2D2;
padding-left: 9px;
margin: 0 0 0 .8ex;
+ color: #777;
+}
+.oembed {
+ font-size: large;
+ font-weight: bold;
}
.aprofile dt{
box-shadow: 1px 1px 5px 0;
diff --git a/view/theme/diabook-blue/style.css b/view/theme/diabook-blue/style.css
index 8a05fc4c4..ebf684708 100644
--- a/view/theme/diabook-blue/style.css
+++ b/view/theme/diabook-blue/style.css
@@ -447,6 +447,24 @@ a:hover {
/*color: #005c94; */
text-decoration: underline;
}
+.intro-end {
+ border-bottom: 1px solid black;
+ clear: both;
+ margin-bottom: 25px;
+ padding-bottom: 25px;
+ width: 75%;
+ }
+.intro-form-end {
+ clear: both;
+ }
+.intro-fullname {
+ padding-bottom: 5px;
+ padding-top: 5px;
+ }
+.intro-wrapper-end {
+ clear: both;
+ padding-bottom: 5px;
+ }
code {
font-family: Courier, monospace;
white-space: pre;
@@ -1250,7 +1268,6 @@ body .pageheader{
padding: 0;
}
.tab.button {
- margin-right: 5px;
margin-left: 5px;
/*background: none repeat scroll 0 0 #F8F8F8;*/
border: 1px solid #CCCCCC;
@@ -1286,6 +1303,123 @@ body .pageheader{
display: table;
width: 780px;
}
+.wall-item-photo-container .wall-item-item, .wall-item-container .wall-item-bottom {
+ display: table-row;
+}
+.wall-item-photo-container .wall-item-info {
+ display: table-cell;
+ vertical-align: top;
+ text-align: left;
+ width: 80px;
+}
+.wall-item-photo-container .wall-item-location {
+ padding-right: 40px;
+ display: table-cell;
+}
+.wall-item-photo-container .wall-item-ago {
+ word-wrap: break-word;
+ width: 50px;
+ margin-left: 10px;
+ color: #999;
+}
+.wall-item-photo-container .wall-item-content {
+ font-size: 12.5px;
+ max-width: 720px;
+ word-wrap: break-word;
+ line-height: 1.2;
+ margin-bottom: 14px;
+}
+.wall-item-photo-container .wall-item-content img {
+ max-width: 700px;
+}
+.wall-item-photo-container .wall-item-links, .wall-item-photo-container .wall-item-actions {
+ display: table-cell;
+ vertical-align: middle;
+}
+.wall-item-photo-container .wall-item-links .icon, .wall-item-photo-container .wall-item-actions .icon {
+ opacity: 0.5;
+ -webkit-transition: all 0.2s ease-in-out;
+ -moz-transition: all 0.2s ease-in-out;
+ -o-transition: all 0.2s ease-in-out;
+ -ms-transition: all 0.2s ease-in-out;
+ transition: all 0.2s ease-in-out;
+}
+.wall-item-photo-container .wall-item-links .icon:hover, .wall-item-photo-container .wall-item-actions .icon:hover {
+ opacity: 1;
+ -webkit-transition: all 0.2s ease-in-out;
+ -moz-transition: all 0.2s ease-in-out;
+ -o-transition: all 0.2s ease-in-out;
+ -ms-transition: all 0.2s ease-in-out;
+ transition: all 0.2s ease-in-out;
+}
+.wall-item-photo-container .wall-item-name {
+ font-weight: bold;
+}
+.wall-item-photo-container .wall-item-actions-author {
+ width: 100%;
+ margin-bottom: 0.3em;
+}
+.wall-item-photo-container .wall-item-actions-social {
+ float: left;
+ margin-bottom: 1px;
+ display: table-cell;
+}
+.wall-item-photo-container .wall-item-actions-social a {
+ margin-right: 1em;
+}
+.wall-item-photo-container .wall-item-actions-tools {
+ float: right;
+ width: 80px;
+ display: table-cell;
+}
+.wall-item-photo-container .wall-item-actions-tools a {
+ float: right;
+}
+.wall-item-photo-container .wall-item-actions-tools input {
+ float: right;
+}
+.wall-item-photo-container.comment {
+ margin-top: 5px;
+ margin-bottom: 5px;
+ margin-left: 40px;
+ width: 650px;
+ border-bottom: 1px solid #D2D2D2;
+}
+.wall-item-photo-container.comment {
+ top: 15px !important;
+ left: 15px !important;
+}
+.wall-item-photo-container {
+ display: table;
+ width: 780px;
+}
+.my-comment-photo {
+ width: 48px;
+ margin-left: 40px;
+ margin-right: 32px;
+ }
+.comment-edit-preview {
+ width: 500px;
+ margin-top: 10px;
+}
+.comment-edit-text-empty {
+ width: 500px;
+ border: 1px solid #D2D2D2;
+ height: 3.2em;
+ color: #2d2d2d;
+}
+.comment-edit-text-full {
+ font-size: 12.5px;
+ height: 3.3em;
+
+ border: 1px solid #D2D2D2;
+ width: 500px;
+}
+.comment-edit-photo {
+ margin: 10px 0 0;
+ display: table-cell;
+}
+
.wall-item-container .wall-item-item, .wall-item-container .wall-item-bottom {
@@ -1339,6 +1473,7 @@ body .pageheader{
max-width: 720px;
word-wrap: break-word;
line-height: 1.2;
+ margin-bottom: 14px;
}
.wall-item-container .wall-item-content img {
@@ -1436,9 +1571,9 @@ body .pageheader{
border: 1px solid #2d2d2d;
}
.comment-edit-preview {
- width: 710px;
- border: 1px solid #2d2d2d;
+ width: 500px;
margin-top: 10px;
+ background-color: #fff797;
}
.comment-edit-preview .contact-photo {
width: 32px;
@@ -1674,7 +1809,7 @@ body .pageheader{
height: 20px;
margin: 0 0 5px;
width: 60%;
- border: 1px solid #ffffff;
+ border: 1px solid #d2d2d2;
}
#profile-jot-form #jot-title:-webkit-input-placeholder {
font-weight: normal;
@@ -2067,10 +2202,10 @@ height: 350px;
/* photo */
.photo {
box-shadow: 2px 2px 5px 0px #000000;
-margin: 2px 5px 2px 5px;
-max-height: 85%;
-max-width: 85%;
+margin: 0px;
border-radius: 10px;
+height: 145px !important;
+width: 145px !important;
}
.lframe {
float: left;
@@ -2143,6 +2278,11 @@ blockquote {
border-left: 1px solid #D2D2D2;
padding-left: 9px;
margin: 0 0 0 .8ex;
+ color: #777;
+}
+.oembed {
+ font-size: large;
+ font-weight: bold;
}
.aprofile dt{
box-shadow: 1px 1px 5px 0;
diff --git a/view/theme/diabook-blue/theme.php b/view/theme/diabook-blue/theme.php
index 2e7aca92a..a8b4fcd6c 100755
--- a/view/theme/diabook-blue/theme.php
+++ b/view/theme/diabook-blue/theme.php
@@ -3,11 +3,15 @@
/*
* Name: Diabook-blue
* Description: Diabook-blue: report bugs and request here: http://pad.toktan.org/p/diabook or contact me : thomas_bierey@friendica.eu
- * Version: (Version: 1.012)
+ * Version: (Version: 1.014)
* Author:
*/
+//print diabook-version for debugging
+$diabook_version = "Diabook-blue (Version: 1.014)";
+$a->page['htmlhead'] .= sprintf('<script "%s" ></script>', $diabook_version);
+
//change css on network and profilepages
$cssFile = null;
@@ -333,8 +337,25 @@ if (!is_null($cssFile)) $a->page['htmlhead'] .= sprintf('<link rel="stylesheet"
$cookieJS = $a->get_baseurl($ssl_state)."/view/theme/diabook-blue/js/jquery.cookie.js";
$a->page['htmlhead'] .= sprintf('<script language="JavaScript" src="%s" ></script>', $cookieJS);
+//load jquery.ae.image.resize.js
+$imageresizeJS = $a->get_baseurl($ssl_state)."/view/theme/diabook-blue/js/jquery.ae.image.resize.js";
+$a->page['htmlhead'] .= sprintf('<script language="JavaScript" src="%s" ></script>', $imageresizeJS);
//js scripts
+//comment-edit-wrapper on photo_view
+if ($a->argv[0].$a->argv[2] === "photos"."image"){
+
+$a->page['htmlhead'] .= '
+<script>
+ $(function(){
+
+ $(".comment-edit-form").css("display","table");
+
+ });
+ </script>';
+
+}
+
$a->page['htmlhead'] .= '
@@ -350,6 +371,10 @@ if ($a->argv[0].$a->argv[1] === "profile".$a->user['nickname'] or $a->argv[0] ==
$a->page['htmlhead'] .= '
<script>
+$(function() {
+ $(".oembed.photo img").aeImageResize({height: 400, width: 400});
+ });
+
$("right_aside").ready(function(){
if($.cookie("close_pages") == "1")
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-17 04:04:06 +0000