diff --git a/view/theme/blog/default.php b/view/theme/blog/default.php index 82c868a..137985d 100755 --- a/view/theme/blog/default.php +++ b/view/theme/blog/default.php @@ -62,6 +62,7 @@ + diff --git a/view/theme/blog/end.tpl b/view/theme/blog/end.tpl new file mode 100644 index 0000000..252b924 --- /dev/null +++ b/view/theme/blog/end.tpl @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/view/theme/blog/icons/folder-open.png b/view/theme/blog/icons/folder-open.png new file mode 100644 index 0000000..e66886e Binary files /dev/null and b/view/theme/blog/icons/folder-open.png differ diff --git a/view/theme/blog/icons/remove.png b/view/theme/blog/icons/remove.png new file mode 100644 index 0000000..575c984 Binary files /dev/null and b/view/theme/blog/icons/remove.png differ diff --git a/view/theme/blog/icons/share.png b/view/theme/blog/icons/share.png new file mode 100644 index 0000000..09c6f27 Binary files /dev/null and b/view/theme/blog/icons/share.png differ diff --git a/view/theme/blog/icons/star.png b/view/theme/blog/icons/star.png new file mode 100644 index 0000000..6a0133a Binary files /dev/null and b/view/theme/blog/icons/star.png differ diff --git a/view/theme/blog/icons/star3.png b/view/theme/blog/icons/star3.png new file mode 100644 index 0000000..a9f96ea Binary files /dev/null and b/view/theme/blog/icons/star3.png differ diff --git a/view/theme/blog/icons/tag.png b/view/theme/blog/icons/tag.png new file mode 100644 index 0000000..74a5151 Binary files /dev/null and b/view/theme/blog/icons/tag.png differ diff --git a/view/theme/blog/icons/thumbs-up.png b/view/theme/blog/icons/thumbs-up.png new file mode 100644 index 0000000..f2664ef Binary files /dev/null and b/view/theme/blog/icons/thumbs-up.png differ diff --git a/view/theme/blog/icons/thumbs-up2.png b/view/theme/blog/icons/thumbs-up2.png new file mode 100644 index 0000000..aa11e5c Binary files /dev/null and b/view/theme/blog/icons/thumbs-up2.png differ diff --git a/view/theme/blog/js/jquery-color-min.js b/view/theme/blog/js/jquery-color-min.js new file mode 100644 index 0000000..17747b5 --- /dev/null +++ b/view/theme/blog/js/jquery-color-min.js @@ -0,0 +1 @@ +(function(d){d.each(["backgroundColor","borderBottomColor","borderLeftColor","borderRightColor","borderTopColor","color","outlineColor"],function(f,e){d.fx.step[e]=function(g){if(!g.colorInit){g.start=c(g.elem,e);g.end=b(g.end);g.colorInit=true}g.elem.style[e]="rgb("+[Math.max(Math.min(parseInt((g.pos*(g.end[0]-g.start[0]))+g.start[0]),255),0),Math.max(Math.min(parseInt((g.pos*(g.end[1]-g.start[1]))+g.start[1]),255),0),Math.max(Math.min(parseInt((g.pos*(g.end[2]-g.start[2]))+g.start[2]),255),0)].join(",")+")"}});function b(f){var e;if(f&&f.constructor==Array&&f.length==3){return f}if(e=/rgb\(\s*([0-9]{1,3})\s*,\s*([0-9]{1,3})\s*,\s*([0-9]{1,3})\s*\)/.exec(f)){return[parseInt(e[1]),parseInt(e[2]),parseInt(e[3])]}if(e=/rgb\(\s*([0-9]+(?:\.[0-9]+)?)\%\s*,\s*([0-9]+(?:\.[0-9]+)?)\%\s*,\s*([0-9]+(?:\.[0-9]+)?)\%\s*\)/.exec(f)){return[parseFloat(e[1])*2.55,parseFloat(e[2])*2.55,parseFloat(e[3])*2.55]}if(e=/#([a-fA-F0-9]{2})([a-fA-F0-9]{2})([a-fA-F0-9]{2})/.exec(f)){return[parseInt(e[1],16),parseInt(e[2],16),parseInt(e[3],16)]}if(e=/#([a-fA-F0-9])([a-fA-F0-9])([a-fA-F0-9])/.exec(f)){return[parseInt(e[1]+e[1],16),parseInt(e[2]+e[2],16),parseInt(e[3]+e[3],16)]}if(e=/rgba\(0, 0, 0, 0\)/.exec(f)){return a.transparent}return a[d.trim(f).toLowerCase()]}function c(g,e){var f;do{f=d.curCSS(g,e);if(f!=""&&f!="transparent"||d.nodeName(g,"body")){break}e="backgroundColor"}while(g=g.parentNode);return b(f)}var a={transparent:[255,255,255]}})(jQuery); \ No newline at end of file diff --git a/view/theme/blog/js/theme.js b/view/theme/blog/js/theme.js new file mode 100644 index 0000000..313b23c --- /dev/null +++ b/view/theme/blog/js/theme.js @@ -0,0 +1,38 @@ +// confirm delete, call delete via ajax, remove item from dom +$(".item.drophide").bind("click", function(e){ + var sender = (e && e.target) || (window.event && window.event.srcElement); + var dropurl = baseurl + "/" +$(sender).attr('href'); + var ret = confirmDelete(); // use friendica confirmDelete function. Translated message for free. + if (ret==false) return false; + $.ajax(dropurl,{ + dataType: "json", + url: dropurl, + success: function(data){ + console.log(data); + /* if(data[1]!=0){ + $("#item-"+data[0]).hide(400, function(){ + $(this).remove(); + }); + }*/ + } + }); + return false; +}); + +// move selection tools on clicks +$("input.item-select").bind("click", function(e){ + var sender = (e && e.target) || (window.event && window.event.srcElement); + var position = $(sender).offset(); + position.left = position.left + 30; + + var n = $( "input.item-select:checked" ).length; + if (n>0){ + $("#selection-tools").show(400).offset(position); + } else { + position.top = 0; + $("#selection-tools").offset(position).hide(400); + + + } + console.log(position); +}); \ No newline at end of file diff --git a/view/theme/blog/search_item.tpl b/view/theme/blog/search_item.tpl index 13b0235..0192fde 100644 --- a/view/theme/blog/search_item.tpl +++ b/view/theme/blog/search_item.tpl @@ -23,5 +23,12 @@

$item.body

+ + + diff --git a/view/theme/blog/style.css b/view/theme/blog/style.css index 293bef9..20b1ef4 100644 --- a/view/theme/blog/style.css +++ b/view/theme/blog/style.css @@ -357,7 +357,7 @@ h2.fn { font-weight: bold; font-size: 1.2em;} /* tabs */ -ul.tabs { display: block; list-style: none; margin: 0px; height: auto; overflow: auto;} +ul.tabs { display: block; list-style: none; margin: 0px 100px 0px 0px; height: auto; overflow: auto;} ul.tabs li { display: block; float: left; padding-right: 0.2em; } ul.tabs li a { display: block; text-align: center; text-decoration: none; padding: 0px 0.5em; } ul.tabs li a:hover { background-color: #EEEEEE; } @@ -451,7 +451,6 @@ ul.tabs li a.active { background-color: #1982D1; color: #ffffff; } .reply li.comment { position: relative; margin-left: 40px; background-color:rgba(0, 0, 0, 0.03); padding-left: 20px;} .reply .avatar { left: -40px; width: 32px; height: 32px; background-color: #fff;} - /* comment form */ .respond { height: auto; overflow: auto; } .respond .form-submit { margin-top: 20px; } @@ -467,6 +466,19 @@ ul.tabs li a.active { background-color: #1982D1; color: #ffffff; } clear: both; margin-top: 40px; } +/* compact in network view */ +.hentry.compact { margin-bottom: 0px;} +#comments.compact { border-bottom: 1px solid #aaaaaa; padding: 0px; background-color: #DDDDDD;} +#comments.compact > .reply-link { padding: 10px; } +.compact .respond { display: none; } +.compact .commentlist { width: 100%; } +.compact .commentlist > li.comment { border: none; border-radius: 0px; margin: 0px; padding: 10px; border-top: 1px solid #aaaaaa; } +.compact .commentlist .avatar { left: -44px; width: 34px; height: 34px; } +.compact .commentlist > li::before { display: none; } +/* item author icon */ +.hentry .avatar { position: absolute; left: -73px; top: 20px; border-radius: 3px; box-shadow: 0px 1px 2px #CCCCCC; } + + /* search item */ article.search { background: #F6F6F6; @@ -504,6 +516,44 @@ article.search .avatar { #search-box input[type="submit"]{ margin: 1em 2em 2em 0px; } #content > h2 { margin-bottom: 2em; } /* evabbe', poi tolgo l'html da 'sto schifo di php */ +/* lock panel */ +#panel { + position: absolute; + background: #F9F9F9; + border: 1px solid #DDDDDD; + color: #444444; + display: block; + font-weight: 400; + height: auto; + line-height: 1em; + padding: 10px; + text-decoration: none; + z-index: 99999; +} + +/* selected tools panel */ +#selection-tools { + position: absolute; + background: #F9F9F9; + border: 1px solid #DDDDDD; + color: #444444; + display: block; + font-weight: 400; + height: auto; + line-height: 1em; + padding: 10px; + text-decoration: none; + z-index: 99999; + transition: top 1s; + -moz-transition: top 1s; /* Firefox 4 */ + -webkit-transition: top 1s; /* Safari and Chrome */ + -o-transition: top 1s; /* Opera */ + top: 0px; +} + +/* item tools */ +.right-tools {float: right;} + /* profile menu */ ul#profiles-menu { top: 2em; left: 9px; width: 176px; } ul#profiles-menu li img { width: 16px; vertical-align: middle; margin-right: 10px;} @@ -528,17 +578,30 @@ ul#profiles-menu li img { width: 16px; vertical-align: middle; margin-right: 10p .contact.dropmenu .menu-popup { left: 120px; top: 0px;} /* icons */ +.like-rotator { position: absolute; left: -20px;} + .icon { display: inline-block; margin: 0px; padding: 0px; width: 16px; height: 16px; } .icon.camera { background: url(icons/image.png) transparent center center no-repeat; } -.icon.attach { background: url(icons/attachment.png) transparent center center no-repeat; } -.icon.link { background: url(icons/link.png) transparent center center no-repeat; } -.icon.video { background: url(icons/youtube2.png) transparent center center no-repeat; } -.icon.audio { background: url(icons/headphones.png) transparent center center no-repeat; } -.icon.globe { background: url(icons/location.png) transparent center center no-repeat; } +.icon.attach { background: url(icons/attachment.png) transparent center center no-repeat; } +.icon.link { background: url(icons/link.png) transparent center center no-repeat; } +.icon.video { background: url(icons/youtube2.png) transparent center center no-repeat; } +.icon.audio { background: url(icons/headphones.png) transparent center center no-repeat; } +.icon.globe { background: url(icons/location.png) transparent center center no-repeat; } .icon.noglobe { background: url(icons/globe.png) transparent center center no-repeat; } -.icon.lock { background: url(icons/lock2.png) transparent center center no-repeat; } +.icon.lock { background: url(icons/lock2.png) transparent center center no-repeat; } .icon.unlock { background: url(icons/unlocked.png) transparent center center no-repeat; } -.icon.edit { background: url(icons/pencil.png) transparent center center no-repeat; } +.icon.edit { background: url(icons/pencil.png) transparent center center no-repeat; } + +.icon.like { background: url(icons/thumbs-up.png) transparent center center no-repeat; } +.icon.dislike { background: url(icons/thumbs-up2.png) transparent center center no-repeat; } +.icon.recycle { background: url(icons/share.png) transparent center center no-repeat; } +.icon.starred { background: url(icons/star3.png) transparent center center no-repeat; } +.icon.unstarred { background: url(icons/star.png) transparent center center no-repeat; } +.icon.file { background: url(icons/folder-open.png) transparent center center no-repeat; } +.icon.tag { background: url(icons/tag.png) transparent center center no-repeat; } +.icon.drophide { background: url(icons/remove.png) transparent center center no-repeat; } + +.icon.sep { display:inline-block; text-align: center; font-size: 26px; line-height: 16px;} .icon.on { border: 1px solid #cccccc; background-color: #56ef46; -webkit-border-radius: 16px 16px 16px 16px; diff --git a/view/theme/blog/threaded_conversation.tpl b/view/theme/blog/threaded_conversation.tpl index e79d4dc..4b23f3f 100644 --- a/view/theme/blog/threaded_conversation.tpl +++ b/view/theme/blog/threaded_conversation.tpl @@ -4,15 +4,16 @@ $live_update {{ inc $thread.template with $item=$thread }}{{ endinc }} {{ endfor }} -
{{ if $dropping }} -