diff options
Diffstat (limited to 'view/theme/dispy')
25 files changed, 1832 insertions, 978 deletions
diff --git a/view/theme/dispy/bottom.tpl b/view/theme/dispy/bottom.tpl new file mode 100644 index 000000000..130bfb25a --- /dev/null +++ b/view/theme/dispy/bottom.tpl @@ -0,0 +1,46 @@ +<script type="text/javascript" src="$baseurl/view/theme/dispy/js/jquery.autogrow.textarea.js"></script> +<script type="text/javascript"> +$(document).ready(function() { + +}); +function tautogrow(id) { + $("textarea#comment-edit-text-" + id).autogrow(); +}; + +function insertFormatting(comment, BBcode, id) { + var tmpStr = $("#comment-edit-text-" + id).val(); + if(tmpStr == comment) { + tmpStr = ""; + $("#comment-edit-text-" + id).addClass("comment-edit-text-full"); + $("#comment-edit-text-" + id).removeClass("comment-edit-text-empty"); + openMenu("comment-edit-submit-wrapper-" + id); + } + textarea = document.getElementById("comment-edit-text-" + id); + if (document.selection) { + textarea.focus(); + selected = document.selection.createRange(); + if (BBcode == "url") { + selected.text = "["+BBcode+"]" + "http://" + selected.text + "[/"+BBcode+"]"; + } else { + selected.text = "["+BBcode+"]" + selected.text + "[/"+BBcode+"]"; + } + } else if (textarea.selectionStart || textarea.selectionStart == "0") { + var start = textarea.selectionStart; + var end = textarea.selectionEnd; + if (BBcode == "url") { + textarea.value = textarea.value.substring(0, start) + "["+BBcode+"]" + + "http://" + textarea.value.substring(start, end) + + "[/"+BBcode+"]" + textarea.value.substring(end, textarea.value.length); + } else { + textarea.value = textarea.value.substring(0, start) + + "["+BBcode+"]" + textarea.value.substring(start, end) + "[/"+BBcode+"]" + + textarea.value.substring(end, textarea.value.length); + } + } + return true; +} + +function cmtBbOpen(id) { + $(".comment-edit-bb-" + id).show(); +} +</script> diff --git a/view/theme/dispy/comment_item.tpl b/view/theme/dispy/comment_item.tpl index adf2772af..b4fbae5df 100644 --- a/view/theme/dispy/comment_item.tpl +++ b/view/theme/dispy/comment_item.tpl @@ -11,14 +11,49 @@ <a class="comment-edit-photo-link" href="$mylink" title="$mytitle"><img class="my-comment-photo" src="$myphoto" alt="$mytitle" title="$mytitle" /></a> </div> <div class="comment-edit-photo-end"></div> - <textarea id="comment-edit-text-$id" class="comment-edit-text-empty" name="body" onFocus="commentOpen(this,$id);" onBlur="commentClose(this,$id);" >$comment</textarea> + <ul class="comment-edit-bb-$id"> + <li><a class="editicon boldbb shadow" + style="cursor: pointer;" + onclick="insertFormatting('$comment','b', $id);"></a></li> + <li><a class="editicon italicbb shadow" + style="cursor: pointer;" + onclick="insertFormatting('$comment','i', $id);"></a></li> + <li><a class="editicon underlinebb shadow" + style="cursor: pointer;" + onclick="insertFormatting('$comment','u', $id);"></a></li> + <li><a class="editicon quotebb shadow" + style="cursor: pointer;" + onclick="insertFormatting('$comment','quote', $id);"></a></li> + <li><a class="editicon codebb shadow" + style="cursor: pointer;" + onclick="insertFormatting('$comment','code', $id);"></a></li> + <li><a class="editicon imagebb shadow" + style="cursor: pointer;" + onclick="insertFormatting('$comment','img', $id);"></a></li> + <li><a class="editicon urlbb shadow" + style="cursor: pointer;" + onclick="insertFormatting('$comment','url', $id);"></a></li> + <li><a class="editicon videobb shadow" + style="cursor: pointer;" + onclick="insertFormatting('$comment','video', $id);"></a></li> + </ul> + <div class="comment-edit-bb-end"></div> + <textarea id="comment-edit-text-$id" + class="comment-edit-text-empty" + name="body" + onfocus="commentOpen(this,$id);tautogrow($id);cmtBbOpen($id);" + onblur="commentClose(this,$id);" + placeholder="Comment">$comment</textarea> {{ if $qcomment }} <div class="qcomment-wrapper"> - <select id="qcomment-select-$id" name="qcomment-$id" class="qcomment" onchange="qCommentInsert(this,$id);"> + <select id="qcomment-select-$id" + name="qcomment-$id" + class="qcomment" + onchange="qCommentInsert(this,$id);"> <option value=""></option> - {{ for $qcomment as $qc }} + {{ for $qcomment as $qc }} <option value="$qc">$qc</option> - {{ endfor }} + {{ endfor }} </select> </div> {{ endif }} diff --git a/view/theme/dispy/communityhome.tpl b/view/theme/dispy/communityhome.tpl index edabab611..4d09b9255 100644 --- a/view/theme/dispy/communityhome.tpl +++ b/view/theme/dispy/communityhome.tpl @@ -37,8 +37,3 @@ </div> {{ endif }} -<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> - diff --git a/view/theme/dispy/default.php b/view/theme/dispy/default.php index b02f41947..c3e6c9119 100644 --- a/view/theme/dispy/default.php +++ b/view/theme/dispy/default.php @@ -10,6 +10,9 @@ <?php if(x($page, 'header')) echo $page['header']; ?> </header> <article id="articlemain"> + <header id="articleheader"> + <?php if(x($page, 'articleheader')) echo $page['articleheader']; ?> + </header> <?php if(x($page,'nav')) echo $page['nav']; ?> <aside id="asideleft"> <?php if(x($page,'aside_left')) echo $page['aside_left']; ?> @@ -17,7 +20,8 @@ </aside> <section id="sectionmain"> <?php if(x($page,'content')) echo $page['content']; ?> - <footer id="section-footer"></footer> + <footer id="sectionfooter"> + </footer> </section> <aside id="asidemain"> <?php if(x($page,'aside')) echo $page['aside']; ?> @@ -27,10 +31,14 @@ <?php if(x($page,'aside_right')) echo $page['aside_right']; ?> <?php if(x($page,'aside_right_bottom')) echo $page['aside_right_bottom']; ?> </aside> + <footer id="articlefooter"> + <?php if(x($page, 'articlefooter')) echo $page['articlefooter']; ?> + </footer> </article> - <footer id="page-footer"> - <?php if(x($page,'footer')) echo $page['footer']; ?> + <footer id="footer"> + <?php if(x($page, 'footer')) echo $page['footer']; ?> </footer> + <?php if (x($page, 'bottom')) echo $page['bottom']; ?> </body> </html> diff --git a/view/theme/dispy/editicons.png b/view/theme/dispy/editicons.png Binary files differnew file mode 100644 index 000000000..41eafbb15 --- /dev/null +++ b/view/theme/dispy/editicons.png diff --git a/view/theme/dispy/editicons.svg b/view/theme/dispy/editicons.svg new file mode 100644 index 000000000..2691d24b4 --- /dev/null +++ b/view/theme/dispy/editicons.svg @@ -0,0 +1,725 @@ +<?xml version="1.0" encoding="UTF-8" standalone="no"?> +<!-- Created with Inkscape (http://www.inkscape.org/) --> + +<svg + xmlns:dc="http://purl.org/dc/elements/1.1/" + xmlns:cc="http://creativecommons.org/ns#" + xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" + xmlns:svg="http://www.w3.org/2000/svg" + xmlns="http://www.w3.org/2000/svg" + xmlns:xlink="http://www.w3.org/1999/xlink" + xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" + xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" + width="250" + height="200" + contentStyleType="text/css" + contentScriptType="text/ecmascript" + sodipodi:docname="editicons.svg" + inkscape:output_extension="org.inkscape.output.svg.inkscape" + version="1.1" + id="svg1" + inkscape:version="0.48+devel r" + inkscape:export-filename="/var/www3/kisikew.org/portal/pub/fd/view/theme/dispy/editicons.png" + inkscape:export-xdpi="90" + inkscape:export-ydpi="90"> + <title + id="title4806">editicons</title> + <defs + id="defs4" /> + <sodipodi:namedview + id="base" + pagecolor="#8a8a8a" + bordercolor="#666666" + borderopacity="1.0" + inkscape:pageopacity="0" + inkscape:pageshadow="0" + inkscape:zoom="2.6353376" + inkscape:cx="71.888976" + inkscape:cy="165.17294" + inkscape:document-units="px" + inkscape:current-layer="svg1" + showgrid="false" + inkscape:window-width="1100" + inkscape:window-height="740" + inkscape:window-x="34" + inkscape:window-y="42" + inkscape:window-maximized="0" + inkscape:showpageshadow="false" + width="0px" + height="0px" + fit-margin-top="0" + fit-margin-left="0" + fit-margin-right="0" + fit-margin-bottom="0" /> + <metadata + id="metadata1"> + <rdf:RDF> + <cc:Work + rdf:about=""> + <dc:format>image/svg+xml</dc:format> + <dc:type + rdf:resource="http://purl.org/dc/dcmitype/StillImage" /> + <dc:title>editicons</dc:title> + <dc:contributor> + <cc:Agent> + <dc:title>Simon L'nu</dc:title> + </cc:Agent> + </dc:contributor> + <dc:date>2012-04-20</dc:date> + <dc:creator> + <cc:Agent> + <dc:title>Simon L'nu</dc:title> + </cc:Agent> + </dc:creator> + <dc:publisher> + <cc:Agent> + <dc:title>Simon L'nu</dc:title> + </cc:Agent> + </dc:publisher> + <dc:subject> + <rdf:Bag> + <rdf:li /> + </rdf:Bag> + </dc:subject> + <dc:description> + <dc:title>DESCRIPTION</dc:title> + </dc:description> + <cc:license + rdf:resource="http://artlibre.org/licence/lal" /> + <dc:language>en-CA</dc:language> + </cc:Work> + <cc:License + rdf:about="http://artlibre.org/licence/lal"> + <cc:permits + rdf:resource="http://creativecommons.org/ns#Reproduction" /> + <cc:permits + rdf:resource="http://creativecommons.org/ns#Distribution" /> + <cc:permits + rdf:resource="http://creativecommons.org/ns#DerivativeWorks" /> + <cc:requires + rdf:resource="http://creativecommons.org/ns#ShareAlike" /> + <cc:requires + rdf:resource="http://creativecommons.org/ns#Notice" /> + <cc:requires + rdf:resource="http://creativecommons.org/ns#Attribution" /> + </cc:License> + </rdf:RDF> + </metadata> + <g + inkscape:label="Layer1" + inkscape:groupmode="layer" + id="layer1" + transform="translate(0.43349891,-524.43349)" /> + <rect + style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:#ececec;stroke-opacity:1" + id="rect4713" + width="20" + height="20" + x="66.405151" + y="68.413567" + rx="3" + ry="3" + transform="translate(-42.805152,-66.847069)" /> + <text + xml:space="preserve" + style="font-size:22px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;text-align:center;writing-mode:lr-tb;text-anchor:middle;fill:#e6e6e6;fill-opacity:1;fill-rule:nonzero;stroke:none;font-family:Verdana;-inkscape-font-specification:Verdana Bold" + x="79.591835" + y="91.591835" + id="text4709" + transform="translate(-46.16293,-73.825339)"><tspan + sodipodi:role="line" + id="tspan4711" + x="79.591835" + y="91.591835" + style="font-size:18px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;fill:#e6e6e6;font-family:Droid Sans;-inkscape-font-specification:Droid Sans Bold">B</tspan></text> + <rect + style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:#ececec;stroke-opacity:1" + id="rect4721" + width="20" + height="20" + x="66.405151" + y="68.413567" + rx="3" + ry="3" + transform="translate(-42.805152,21.152934)" /> + <rect + style="fill:#2e2f2e;fill-opacity:1;fill-rule:nonzero;stroke:#ececec;stroke-opacity:1" + id="rect4725" + width="20" + height="20" + x="66.405151" + y="68.413567" + rx="3" + ry="3" + transform="translate(-64.805152,-66.847066)" /> + <rect + transform="translate(-64.805152,-44.847066)" + ry="3" + rx="3" + y="68.413567" + x="66.405151" + height="20" + width="20" + id="rect4727" + style="fill:#2e2f2e;fill-opacity:1;fill-rule:nonzero;stroke:#ececec;stroke-opacity:1" /> + <rect + style="fill:#2e2f2e;fill-opacity:1;fill-rule:nonzero;stroke:#ececec;stroke-opacity:1" + id="rect4729" + width="20" + height="20" + x="66.405151" + y="68.413567" + rx="3" + ry="3" + transform="translate(-64.805152,-22.84707)" /> + <rect + transform="translate(-64.805152,-0.8470705)" + ry="3" + rx="3" + y="68.413567" + x="66.405151" + height="20" + width="20" + id="rect4731" + style="fill:#2e2f2e;fill-opacity:1;fill-rule:nonzero;stroke:#ececec;stroke-opacity:1" /> + <rect + style="fill:#2e2f2e;fill-opacity:1;fill-rule:nonzero;stroke:#ececec;stroke-opacity:1" + id="rect4733" + width="20" + height="20" + x="66.405151" + y="68.413567" + rx="3" + ry="3" + transform="translate(-64.805152,21.15293)" /> + <rect + transform="translate(1.194848,-66.847066)" + ry="3" + rx="3" + y="68.413567" + x="66.405151" + height="20" + width="20" + id="rect4735" + style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:#ececec;stroke-opacity:1" /> + <rect + style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:#ececec;stroke-opacity:1" + id="rect4737" + width="20" + height="20" + x="66.405151" + y="68.413567" + rx="3" + ry="3" + transform="translate(1.194848,-44.847066)" /> + <rect + transform="translate(1.194848,-22.84707)" + ry="3" + rx="3" + y="68.413567" + x="66.405151" + height="20" + width="20" + id="rect4739" + style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:#ececec;stroke-opacity:1" /> + <rect + style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:#ececec;stroke-opacity:1" + id="rect4741" + width="20" + height="20" + x="66.405151" + y="68.413567" + rx="3" + ry="3" + transform="translate(1.194848,-0.8470705)" /> + <rect + transform="translate(1.194848,21.15293)" + ry="3" + rx="3" + y="68.413567" + x="66.405151" + height="20" + width="20" + id="rect4743" + style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:#ececec;stroke-opacity:1" /> + <rect + style="fill:#2e2f2e;fill-opacity:1;fill-rule:nonzero;stroke:#ececec;stroke-opacity:1" + id="rect4745" + width="20" + height="20" + x="66.405151" + y="68.413567" + rx="3" + ry="3" + transform="translate(-20.805152,-66.847066)" /> + <rect + transform="translate(-20.805152,-44.847066)" + ry="3" + rx="3" + y="68.413567" + x="66.405151" + height="20" + width="20" + id="rect4747" + style="fill:#2e2f2e;fill-opacity:1;fill-rule:nonzero;stroke:#ececec;stroke-opacity:1" /> + <rect + style="fill:#2e2f2e;fill-opacity:1;fill-rule:nonzero;stroke:#ececec;stroke-opacity:1" + id="rect4749" + width="20" + height="20" + x="66.405151" + y="68.413567" + rx="3" + ry="3" + transform="translate(-20.805152,-22.84707)" /> + <rect + transform="translate(-20.805152,-0.84707)" + ry="3" + rx="3" + y="68.413567" + x="66.405151" + height="20" + width="20" + id="rect4751" + style="fill:#2e2f2e;fill-opacity:1;fill-rule:nonzero;stroke:#ececec;stroke-opacity:1" /> + <rect + style="fill:#2e2f2e;fill-opacity:1;fill-rule:nonzero;stroke:#ececec;stroke-opacity:1" + id="rect4753" + width="20" + height="20" + x="66.405151" + y="68.413567" + rx="3" + ry="3" + transform="translate(-20.805152,21.15293)" /> + <rect + transform="translate(-42.805152,-44.847069)" + ry="3" + rx="3" + y="68.413567" + x="66.405151" + height="20" + width="20" + id="rect4715" + style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:#ececec;stroke-opacity:1" /> + <text + xml:space="preserve" + style="font-size:20px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;text-align:center;writing-mode:lr-tb;text-anchor:middle;fill:#ececec;fill-opacity:1;fill-rule:nonzero;stroke:none;font-family:Droid Sans;-inkscape-font-specification:Droid Sans Bold" + x="4.7811713" + y="28.940323" + id="text4774" + transform="translate(28.806399,11)"><tspan + sodipodi:role="line" + id="tspan4776" + x="4.7811713" + y="28.940323" + style="font-size:18px">I</tspan></text> + <rect + style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:#ececec;stroke-opacity:1" + id="rect4717" + width="20" + height="20" + x="66.405151" + y="68.413567" + rx="3" + ry="3" + transform="translate(-42.805152,-22.847069)" /> + <text + xml:space="preserve" + style="font-size:20px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;text-align:center;writing-mode:lr-tb;text-anchor:middle;fill:#ececec;fill-opacity:1;fill-rule:nonzero;stroke:none;font-family:Droid Sans;-inkscape-font-specification:Droid Sans Bold" + x="6.4507866" + y="61.118362" + id="text4778" + transform="translate(27,1)"><tspan + sodipodi:role="line" + id="tspan4780" + x="6.4507866" + y="61.118362" + style="font-size:18px">U</tspan></text> + <rect + transform="translate(-42.805152,-0.8470699)" + ry="3" + rx="3" + y="68.413567" + x="66.405151" + height="20" + width="20" + id="rect4719" + style="fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:#ececec;stroke-opacity:1" /> + <text + xml:space="preserve" + style="font-size:20px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;text-align:center;writing-mode:lr-tb;text-anchor:middle;fill:#ececec;fill-opacity:1;fill-rule:nonzero;stroke:none;font-family:Droid Sans;-inkscape-font-specification:Droid Sans Bold" + x="4.28688" + y="81.765083" + id="text4782" + transform="translate(29,0.7234271)"><tspan + sodipodi:role="line" + id="tspan4784" + x="4.28688" + y="81.765083" + style="font-size:18px">Q</tspan></text> + <g + id="g1783" + transform="translate(66.197715,-88)"> + <rect + inkscape:export-ydpi="90" + inkscape:export-xdpi="90" + inkscape:export-filename="/home/fabio/public_html/f9k-tre/icons2.png" + ry="2.9268293" + rx="2.9268293" + y="858.11218" + x="173.12502" + height="9" + width="14.5" + id="rect4387-8" + style="fill:#666666;stroke:#ececec;stroke-width:0.5;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline" + transform="translate(-168.97273,-762.7948)" /> + <path + inkscape:export-ydpi="90" + inkscape:export-xdpi="90" + inkscape:export-filename="/home/fabio/public_html/f9k-tre/icons2.png" + transform="matrix(1.1489362,0,0,1.1489362,-455.1097,-153.28349)" + d="m 411.5,220.26843 c 0,1.50153 -1.20323,2.71875 -2.6875,2.71875 -1.48427,0 -2.6875,-1.21722 -2.6875,-2.71875 0,-1.50152 1.20323,-2.71875 2.6875,-2.71875 1.48427,0 2.6875,1.21723 2.6875,2.71875 z" + sodipodi:ry="2.71875" + sodipodi:rx="2.6875" + sodipodi:cy="220.26843" + sodipodi:cx="408.8125" + id="path4391-3" + style="fill:#1a1a1a;stroke:#e6e6e6;stroke-width:0.5;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline" + sodipodi:type="arc" /> + <rect + inkscape:export-ydpi="90" + inkscape:export-xdpi="90" + inkscape:export-filename="/home/fabio/public_html/f9k-tre/icons2.png" + ry="1" + rx="1" + y="859.06403" + x="174.89275" + height="1.8561553" + width="3.5355339" + id="rect4290" + style="fill:#1a1a1a;stroke:#e6e6e6;stroke-width:0.5;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;display:inline" + transform="translate(-168.97273,-762.7948)" /> + </g> + <g + transform="translate(-43.063391,-846.33726)" + id="g1037"> + <path + inkscape:export-ydpi="90" + inkscape:export-xdpi="90" + inkscape:export-filename="/home/fabio/public_html/f9k-tre/icons2.png" + sodipodi:nodetypes="csccccscc" + inkscape:connector-curvature="0" + id="rect4428-4" + d="m 118.03127,895.15627 0,0.3125 c 0,1.2601 -0.0643,3.4345 -0.35937,5.75 l -1.5625,1e-4 c -0.80183,0.011 -1.64766,4.0737 -1.60938,8.0625 l 8.25,0 c -0.057,-5.5479 1.56902,-11.5211 1.75,-5.6563 0.21453,6.9525 1.74237,-5.1823 1.75,-8.4687 z" + style="fill:none;stroke:#e6e6e6;stroke-width:0.5;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline" /> + <path + inkscape:export-ydpi="90" + inkscape:export-xdpi="90" + inkscape:export-filename="/home/fabio/public_html/f9k-tre/icons2.png" + inkscape:connector-curvature="0" + id="path4440-4" + d="m 124.78127,905.73727 -1.9375,-0.063" + style="fill:none;stroke:#e6e6e6;stroke-width:0.5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline" /> + <path + inkscape:export-ydpi="90" + inkscape:export-xdpi="90" + inkscape:export-filename="/home/fabio/public_html/f9k-tre/icons2.png" + sodipodi:nodetypes="cc" + inkscape:connector-curvature="0" + id="path4442-9" + d="m 117.59377,901.20597 6.4375,0" + style="fill:none;stroke:#e6e6e6;stroke-width:0.5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline" /> + <rect + inkscape:export-ydpi="90" + inkscape:export-xdpi="90" + inkscape:export-filename="/home/fabio/public_html/f9k-tre/icons2.png" + y="908.11218" + x="115.28126" + height="0.375" + width="1.0625" + id="rect4446-9" + style="fill:none;stroke:#e6e6e6;stroke-width:0.5;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline" /> + <rect + inkscape:export-ydpi="90" + inkscape:export-xdpi="90" + inkscape:export-filename="/home/fabio/public_html/f9k-tre/icons2.png" + style="fill:none;stroke:#e6e6e6;stroke-width:0.5;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline" + id="rect4448-3" + width="1.0625" + height="0.375" + x="115.34376" + y="906.51843" /> + <rect + inkscape:export-ydpi="90" + inkscape:export-xdpi="90" + inkscape:export-filename="/home/fabio/public_html/f9k-tre/icons2.png" + y="904.89343" + x="115.50001" + height="0.375" + width="1.0625" + id="rect4450-6" + style="fill:none;stroke:#e6e6e6;stroke-width:0.5;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline" /> + <rect + inkscape:export-ydpi="90" + inkscape:export-xdpi="90" + inkscape:export-filename="/home/fabio/public_html/f9k-tre/icons2.png" + style="fill:none;stroke:#e6e6e6;stroke-width:0.5;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline" + id="rect4452-0" + width="1.0625" + height="0.375" + x="115.81251" + y="903.42468" /> + <rect + inkscape:export-ydpi="90" + inkscape:export-xdpi="90" + inkscape:export-filename="/home/fabio/public_html/f9k-tre/icons2.png" + y="902.17468" + x="116.21876" + height="0.375" + width="1.0625" + id="rect4454-5" + style="fill:none;stroke:#e6e6e6;stroke-width:0.5;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline" /> + <rect + inkscape:export-ydpi="90" + inkscape:export-xdpi="90" + inkscape:export-filename="/home/fabio/public_html/f9k-tre/icons2.png" + style="fill:none;stroke:#e6e6e6;stroke-width:0.5;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline" + id="rect4456-0" + width="1.0625" + height="0.375" + x="118.50001" + y="900.17468" /> + <rect + inkscape:export-ydpi="90" + inkscape:export-xdpi="90" + inkscape:export-filename="/home/fabio/public_html/f9k-tre/icons2.png" + y="898.70593" + x="118.68751" + height="0.375" + width="1.0625" + id="rect4458-2" + style="fill:none;stroke:#e6e6e6;stroke-width:0.5;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline" /> + <rect + inkscape:export-ydpi="90" + inkscape:export-xdpi="90" + inkscape:export-filename="/home/fabio/public_html/f9k-tre/icons2.png" + style="fill:none;stroke:#e6e6e6;stroke-width:0.5;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline" + id="rect4460-9" + width="1.0625" + height="0.375" + x="118.75001" + y="897.20593" /> + <rect + inkscape:export-ydpi="90" + inkscape:export-xdpi="90" + inkscape:export-filename="/home/fabio/public_html/f9k-tre/icons2.png" + y="895.79968" + x="118.75001" + height="0.375" + width="1.0625" + id="rect4462-4" + style="fill:none;stroke:#e6e6e6;stroke-width:0.5;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline" /> + <rect + inkscape:export-ydpi="90" + inkscape:export-xdpi="90" + inkscape:export-filename="/home/fabio/public_html/f9k-tre/icons2.png" + style="fill:none;stroke:#e6e6e6;stroke-width:0.5;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline" + id="rect4464-3" + width="1.0625" + height="0.375" + x="120.84376" + y="908.11218" /> + <rect + inkscape:export-ydpi="90" + inkscape:export-xdpi="90" + inkscape:export-filename="/home/fabio/public_html/f9k-tre/icons2.png" + y="906.51843" + x="120.90627" + height="0.375" + width="1.0625" + id="rect4466-5" + style="fill:none;stroke:#e6e6e6;stroke-width:0.5;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline" /> + <rect + inkscape:export-ydpi="90" + inkscape:export-xdpi="90" + inkscape:export-filename="/home/fabio/public_html/f9k-tre/icons2.png" + style="fill:none;stroke:#e6e6e6;stroke-width:0.5;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline" + id="rect4468-1" + width="1.0625" + height="0.375" + x="121.06252" + y="904.89343" /> + <rect + inkscape:export-ydpi="90" + inkscape:export-xdpi="90" + inkscape:export-filename="/home/fabio/public_html/f9k-tre/icons2.png" + y="903.42468" + x="121.37502" + height="0.375" + width="1.0625" + id="rect4470-7" + style="fill:none;stroke:#e6e6e6;stroke-width:0.5;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline" /> + <rect + inkscape:export-ydpi="90" + inkscape:export-xdpi="90" + inkscape:export-filename="/home/fabio/public_html/f9k-tre/icons2.png" + style="fill:none;stroke:#e6e6e6;stroke-width:0.5;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline" + id="rect4472-4" + width="1.0625" + height="0.375" + x="121.78127" + y="902.17468" /> + <rect + inkscape:export-ydpi="90" + inkscape:export-xdpi="90" + inkscape:export-filename="/home/fabio/public_html/f9k-tre/icons2.png" + y="900.17468" + x="124.06252" + height="0.375" + width="1.0625" + id="rect4474-3" + style="fill:none;stroke:#e6e6e6;stroke-width:0.5;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline" /> + <rect + inkscape:export-ydpi="90" + inkscape:export-xdpi="90" + inkscape:export-filename="/home/fabio/public_html/f9k-tre/icons2.png" + style="fill:none;stroke:#e6e6e6;stroke-width:0.5;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline" + id="rect4476-1" + width="1.0625" + height="0.375" + x="124.25002" + y="898.70593" /> + <rect + inkscape:export-ydpi="90" + inkscape:export-xdpi="90" + inkscape:export-filename="/home/fabio/public_html/f9k-tre/icons2.png" + y="897.20593" + x="124.31252" + height="0.375" + width="1.0625" + id="rect4478-4" + style="fill:none;stroke:#e6e6e6;stroke-width:0.5;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline" /> + <rect + inkscape:export-ydpi="90" + inkscape:export-xdpi="90" + inkscape:export-filename="/home/fabio/public_html/f9k-tre/icons2.png" + style="fill:none;stroke:#e6e6e6;stroke-width:0.5;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline" + id="rect4480-6" + width="1.0625" + height="0.375" + x="124.31252" + y="895.79968" /> + </g> + <g + id="g1790" + transform="translate(22,22)"> + <path + inkscape:export-ydpi="90" + inkscape:export-xdpi="90" + inkscape:export-filename="/home/fabio/public_html/f9k-tre/icons2.png" + inkscape:connector-curvature="0" + id="rect4397-0" + d="m 242.44524,860.13287 c -0.98011,0 -1.77562,0.6006 -1.77562,1.3586 l 0,1.5632 c 0,0.7581 0.79551,1.3733 1.77562,1.3733 l 4.53349,0 c 0.98012,0 1.77562,-0.6152 1.77562,-1.3733 l 0,-1.5632 c 0,-0.758 -0.7955,-1.3586 -1.77562,-1.3586 l -4.53349,0 z m 0.41557,1.0372 3.70235,0 c 0.51967,0 0.94448,0.2879 0.94448,0.6574 l 0,0.8912 c 0,0.3695 -0.42481,0.672 -0.94448,0.672 l -3.70235,0 c -0.51966,0 -0.94447,-0.3025 -0.94447,-0.672 l 0,-0.8912 c 0,-0.3695 0.42481,-0.6574 0.94447,-0.6574 z" + style="fill:#1a1a1a;fill-opacity:1;stroke:#e6e6e6;stroke-width:0.47366244;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline" + transform="matrix(0.87398418,0,0,1,-154.20273,-850.767)" /> + <path + inkscape:export-ydpi="90" + inkscape:export-xdpi="90" + inkscape:export-filename="/home/fabio/public_html/f9k-tre/icons2.png" + style="fill:#1a1a1a;fill-opacity:1;stroke:#e6e6e6;stroke-width:0.47366244;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline" + d="m 232.97199,860.13287 c -0.98011,0 -1.77562,0.6006 -1.77562,1.3586 l 0,1.5632 c 0,0.7581 0.79551,1.3733 1.77562,1.3733 l 4.53349,0 c 0.98012,0 1.77562,-0.6152 1.77562,-1.3733 l 0,-1.5632 c 0,-0.758 -0.7955,-1.3586 -1.77562,-1.3586 l -4.53349,0 z m 0.41557,1.0372 3.70236,0 c 0.51966,0 0.94447,0.2879 0.94447,0.6574 l 0,0.8912 c 0,0.3695 -0.42481,0.672 -0.94447,0.672 l -3.70236,0 c -0.51966,0 -0.94447,-0.3025 -0.94447,-0.672 l 0,-0.8912 c 0,-0.3695 0.42481,-0.6574 0.94447,-0.6574 z" + id="path4418-4" + inkscape:connector-curvature="0" + transform="matrix(0.87398418,0,0,1,-154.20273,-850.767)" /> + <rect + inkscape:export-ydpi="90" + inkscape:export-xdpi="90" + inkscape:export-filename="/home/fabio/public_html/f9k-tre/icons2.png" + ry="0.81812328" + rx="1.0135853" + y="861.57312" + x="236.7028" + height="1.6362466" + width="6.7246785" + id="rect4395-0" + style="fill:#1a1a1a;fill-opacity:1;stroke:#e6e6e6;stroke-width:0.47366244;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline" + transform="matrix(0.87398418,0,0,1,-154.20273,-850.767)" /> + </g> + <use + x="0" + y="0" + xlink:href="#text4709" + id="use1769" + transform="translate(-22,0)" + width="250" + height="200" /> + <use + x="0" + y="0" + xlink:href="#text4774" + id="use1771" + transform="translate(-22,0)" + width="250" + height="200" /> + <use + x="0" + y="0" + xlink:href="#text4778" + id="use1773" + transform="translate(-22,0)" + width="250" + height="200" /> + <use + x="0" + y="0" + xlink:href="#text4782" + id="use1775" + transform="translate(-22,0)" + width="250" + height="200" /> + <use + x="0" + y="0" + xlink:href="#g1783" + id="use1788" + width="250" + height="200" + transform="translate(-22,0)" /> + <use + x="0" + y="0" + xlink:href="#g1037" + id="use1795" + width="250" + height="200" + transform="translate(-22,0)" /> + <use + x="0" + y="0" + xlink:href="#g1790" + id="use1797" + width="250" + height="200" + transform="translate(-22,0)" /> + <text + xml:space="preserve" + style="font-size:18px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;text-align:center;writing-mode:lr-tb;text-anchor:middle;fill:#1a1a1a;fill-opacity:1;fill-rule:nonzero;stroke:none;font-family:Droid Sans;-inkscape-font-specification:Droid Sans Bold" + x="6.5049949" + y="106.76174" + id="text1799" + transform="translate(26,-1)"><tspan + sodipodi:role="line" + id="tspan1801" + x="6.5049949" + y="106.76174" + style="fill:#ececec;fill-opacity:1">C</tspan></text> + <use + x="0" + y="0" + xlink:href="#text1799" + id="use1803" + transform="translate(-22,0)" + width="250" + height="200" /> +</svg> diff --git a/view/theme/dispy/fpostit/README b/view/theme/dispy/fpostit/README deleted file mode 100644 index 39b7c5761..000000000 --- a/view/theme/dispy/fpostit/README +++ /dev/null @@ -1,8 +0,0 @@ -fpostit - -original author: Devlon Duthied - -see his blog posting: -http://blog.duthied.com/2011/09/13/node-agnostic-friendika-bookmarklet/ - -original published at github https://github.com/duthied/Friendika-Bookmarklet diff --git a/view/theme/dispy/fpostit/fpostit.js b/view/theme/dispy/fpostit/fpostit.js deleted file mode 100644 index d18f5d345..000000000 --- a/view/theme/dispy/fpostit/fpostit.js +++ /dev/null @@ -1,14 +0,0 @@ -javascript: (function() { - the_url = 'view/theme/dispy/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)); - a_funct = function() { - if (!window.open(the_url, 'fpostit','location=yes,links=no,scrollbars=no,toolbar=no,width=600,height=300')) { - location.href = the_url - }; - if (/Firefox/.test(navigator.userAgent)) { - setTimeout(a_funct, 0) - } else { - a_funct(); - } - })();" diff --git a/view/theme/dispy/fpostit/fpostit.php b/view/theme/dispy/fpostit/fpostit.php deleted file mode 100644 index d00182946..000000000 --- a/view/theme/dispy/fpostit/fpostit.php +++ /dev/null @@ -1,134 +0,0 @@ -<?php -if (!isset($_POST["friendica_acct_name"])) $_POST["friendica_acct_name"] = ''; -if (!isset($_COOKIE['username'])) $_COOKIE['username'] = ''; -if (!isset($_COOKIE['password'])) $_COOKIE['password'] = ''; -if (!isset($hostname)) $hostname = ''; -if (!isset($username)) $username = ''; - - -if (($_POST["friendica_acct_name"] != '') && ($_POST["friendica_password"] != '')) { - setcookie("username", $_POST["friendica_acct_name"], time()+60*60*24*300); - setcookie("password", $_POST["friendica_password"], time()+60*60*24*300); -} - -?> -<html> -<head> - <style> - body { - font-family: sans-serif; - margin: 0px; - } - .wrap1 { - padding: 2px 5px; - background-color: #000; - margin-bottom: 10px; - } - .wrap2 { - margin-left: 10px; - font-size: 12px; - } - .logo { - margin-left: 3px; - margin-right: 5px; - float: left; - } - h2 { - color: #ffffff; - } - .error { - background-color: #FFFF66; - font-size: 12px; - margin-left: 10px; - } - </style> -</head> - -<body> -<?php - -if (isset($_GET['title'])) { - $title = $_GET['title']; -} -if (isset($_GET['text'])) { - $text = $_GET['text']; -} -if (isset($_GET['url'])) { - $url = $_GET['url']; -} - -if ((isset($title)) && (isset($text)) && (isset($url))) { - $content = "$title\nsource:$url\n\n$text"; -} else { - $content = $_POST['content']; -} - -if (isset($_POST['submit'])) { - - if (($_POST["friendica_acct_name"] != '') && ($_POST["friendica_password"] != '')) { - $acctname = $_POST["friendica_acct_name"]; - $tmp_account_array = explode("@", $acctname); - if (isset($tmp_account_array[1])) { - $username = $tmp_account_array[0]; - $hostname = $tmp_account_array[1]; - } - $password = $_POST["friendica_password"]; - $content = $_POST["content"]; - - $url = "http://" . $hostname . '/api/statuses/update'; - $data = array('status' => $content); - - // echo "posting to: $url<br/>"; - - $c = curl_init(); - curl_setopt($c, CURLOPT_URL, $url); - curl_setopt($c, CURLOPT_USERPWD, "$username:$password"); - curl_setopt($c, CURLOPT_POSTFIELDS, $data); - curl_setopt($c, CURLOPT_RETURNTRANSFER, true); - curl_setopt($c, CURLOPT_FOLLOWLOCATION, true); - $c_result = curl_exec($c); - if(curl_errno($c)){ - $error = curl_error($c); - showForm($error, $content); - } - - curl_close($c); - if (!isset($error)) { - echo '<script language="javascript" type="text/javascript">window.close();</script>'; - } - - } else { - $error = "Missing account name and/or password. Please try again."; - showForm($error, $content); - } - -} else { - showForm(null, $content); -} - -function showForm($error, $content) { - $username_cookie = $_COOKIE['username']; - $password_cookie = $_COOKIE['password']; - - echo <<<EOF - <div class="wrap1"> - <h2><img class="logo" src="friendica-32.png" align="middle" />Friendica Bookmarklet</h2> - </div> - - <div class="wrap2"> - <form method="post" action="{$_SERVER['PHP_SELF']}"> - Enter the email address of the Friendica Account that you want to cross-post to: (example: user@friendica.org)<br /><br /> - Account ID: <input type="text" name="friendica_acct_name" value="{$username_cookie}" size="50" /><br /> - Password: <input type="password" name="friendica_password" value="{$password_cookie}" size="50" /><br /> - <textarea name="content" id="content" rows="6" cols="70">{$content}</textarea><br /> - <input type="submit" value="PostIt!" name="submit" />  <span class="error">$error</span> - </form> - <p></p> - </div> -EOF; - -} -?> - -</body> -</html> diff --git a/view/theme/dispy/fpostit/friendica-32.png b/view/theme/dispy/fpostit/friendica-32.png Binary files differdeleted file mode 100644 index 61764bf20..000000000 --- a/view/theme/dispy/fpostit/friendica-32.png +++ /dev/null diff --git a/view/theme/dispy/fpostit/friendika-32.png b/view/theme/dispy/fpostit/friendika-32.png Binary files differdeleted file mode 100644 index 61764bf20..000000000 --- a/view/theme/dispy/fpostit/friendika-32.png +++ /dev/null diff --git a/view/theme/dispy/head.tpl b/view/theme/dispy/head.tpl index d1bdc256b..d42b19aef 100644 --- a/view/theme/dispy/head.tpl +++ b/view/theme/dispy/head.tpl @@ -1,33 +1,29 @@ <meta http-equiv="Content-Type" content="text/html;charset=utf-8" /> +<meta charset="UTF-8" /> <base href="$baseurl/" /> <meta name="generator" content="$generator" /> +<link rel="shortcut icon" href="$baseurl/images/friendica-32.png" /> +<link rel="search" href="$baseurl/opensearch" + type="application/opensearchdescription+xml" title="Search in Friendica" /> <link rel="stylesheet" href="$baseurl/library/fancybox/jquery.fancybox-1.3.4.css" type="text/css" media="screen" /> <link rel="stylesheet" href="$baseurl/library/tiptip/tipTip.css" type="text/css" media="screen" /> <link rel="stylesheet" href="$baseurl/library/jgrowl/jquery.jgrowl.css" type="text/css" media="screen" /> - <link rel="stylesheet" type="text/css" href="$stylesheet" media="all" /> - -<link rel="shortcut icon" href="$baseurl/images/friendica-32.png" /> -<link rel="search" - href="$baseurl/opensearch" - type="application/opensearchdescription+xml" - title="Search in Friendica" /> - <!--[if IE]> <script type="text/javascript" src="https://html5shiv.googlecode.com/svn/trunk/html5.js"></script> <![endif]--> -<script type="text/javascript" src="$baseurl/js/jquery.js" ></script> -<script type="text/javascript" src="$baseurl/js/jquery.textinputs.js" ></script> -<script type="text/javascript" src="$baseurl/js/fk.autocomplete.js" ></script> +<script type="text/javascript" src="$baseurl/js/jquery.js"></script> +<script type="text/javascript" src="$baseurl/js/acl.js"></script> +<script type="text/javascript" src="$baseurl/js/main.js"></script> +<script type="text/javascript" src="$baseurl/js/jquery.textinputs.js"></script> +<script type="text/javascript" src="$baseurl/js/fk.autocomplete.js"></script> <script type="text/javascript" src="$baseurl/library/fancybox/jquery.fancybox-1.3.4.pack.js"></script> <script type="text/javascript" src="$baseurl/library/tiptip/jquery.tipTip.minified.js"></script> <script type="text/javascript" src="$baseurl/library/jgrowl/jquery.jgrowl_minimized.js"></script> -<script type="text/javascript" src="$baseurl/library/tinymce/jscripts/tiny_mce/tiny_mce_src.js" ></script> -<script type="text/javascript" src="$baseurl/js/acl.js" ></script> -<script type="text/javascript" src="$baseurl/js/webtoolkit.base64.js" ></script> -<script type="text/javascript" src="$baseurl/js/main.js" ></script> +<script type="text/javascript" src="$baseurl/library/tinymce/jscripts/tiny_mce/tiny_mce_src.js"></script> +<script type="text/javascript" src="$baseurl/js/webtoolkit.base64.js"></script> +<!-- in dispy-dark --> <script> - var updateInterval = $update_interval; function confirmDelete() { return confirm("$delitem"); } @@ -48,7 +44,6 @@ } } - function commentInsert(obj,id) { var tmpStr = $("#comment-edit-text-" + id).val(); if(tmpStr == '$comment') { diff --git a/view/theme/dispy/header.tpl b/view/theme/dispy/header.tpl new file mode 100644 index 000000000..e69de29bb --- /dev/null +++ b/view/theme/dispy/header.tpl diff --git a/view/theme/dispy/icons.png b/view/theme/dispy/icons.png Binary files differindex f42330d65..5c2eab36e 100644 --- a/view/theme/dispy/icons.png +++ b/view/theme/dispy/icons.png diff --git a/view/theme/dispy/icons/email.png b/view/theme/dispy/icons/email.png Binary files differindex b9d64cb93..349f5a91e 100644 --- a/view/theme/dispy/icons/email.png +++ b/view/theme/dispy/icons/email.png diff --git a/view/theme/dispy/icons/facebook.png b/view/theme/dispy/icons/facebook.png Binary files differindex ff5129f94..be04f2b52 100644 --- a/view/theme/dispy/icons/facebook.png +++ b/view/theme/dispy/icons/facebook.png diff --git a/view/theme/dispy/icons/posterous.png b/view/theme/dispy/icons/posterous.png Binary files differindex d0ae6face..0d25e01b8 100644 --- a/view/theme/dispy/icons/posterous.png +++ b/view/theme/dispy/icons/posterous.png diff --git a/view/theme/dispy/icons/tumblr.png b/view/theme/dispy/icons/tumblr.png Binary files differindex 9d5fcd045..054cd119d 100644 --- a/view/theme/dispy/icons/tumblr.png +++ b/view/theme/dispy/icons/tumblr.png diff --git a/view/theme/dispy/icons/wordpress.png b/view/theme/dispy/icons/wordpress.png Binary files differindex 6a4e36d45..4ee872b74 100644 --- a/view/theme/dispy/icons/wordpress.png +++ b/view/theme/dispy/icons/wordpress.png diff --git a/view/theme/dispy/jot-header.tpl b/view/theme/dispy/jot-header.tpl index 44120da40..ab15f9516 100644 --- a/view/theme/dispy/jot-header.tpl +++ b/view/theme/dispy/jot-header.tpl @@ -24,7 +24,7 @@ function initEditor(cb) { mode : "specific_textareas", editor_selector: $editselect, auto_focus: "profile-jot-text", - plugins : "bbcode,paste,fullscreen,autoresize", + plugins : "bbcode,paste,fullscreen,autoresize,inlinepopups", theme_advanced_buttons1 : "bold,italic,underline,undo,redo,link,unlink,image,forecolor,formatselect,code,fullscreen", theme_advanced_buttons2 : "", theme_advanced_buttons3 : "", @@ -36,12 +36,13 @@ function initEditor(cb) { entity_encoding : "raw", add_unload_trigger : false, remove_linebreaks : false, - force_p_newlines : true, + force_p_newlines : false, force_br_newlines : true, forced_root_block : '', convert_urls: false, content_css: "$baseurl/view/custom_tinymce.css", theme_advanced_path : false, + file_browser_callback : "fcFileBrowser", setup : function(ed) { cPopup = null; ed.onKeyDown.add(function(ed,e) { @@ -346,4 +347,3 @@ function enableOnUser(){ } </script> - diff --git a/view/theme/dispy/js/jquery.autogrow.textarea.js b/view/theme/dispy/js/jquery.autogrow.textarea.js new file mode 100644 index 000000000..806e34f51 --- /dev/null +++ b/view/theme/dispy/js/jquery.autogrow.textarea.js @@ -0,0 +1,46 @@ +(function($) { + + /* + * Auto-growing textareas; technique ripped from Facebook + */ + $.fn.autogrow = function(options) { + + this.filter('textarea').each(function() { + + var $this = $(this), + minHeight = $this.height(), + lineHeight = $this.css('lineHeight'); + + var shadow = $('<div></div>').css({ + position: 'absolute', + top: -10000, + left: -10000, + width: $(this).width(), + fontSize: $this.css('fontSize'), + fontFamily: $this.css('fontFamily'), + lineHeight: $this.css('lineHeight'), + resize: 'none' + }).appendTo(document.body); + + var update = function() { + + var val = this.value.replace(/</g, '<') + .replace(/>/g, '>') + .replace(/&/g, '&') + .replace(/\n/g, '<br/>'); + + shadow.html(val); + $(this).css('height', Math.max(shadow.height() + 20, minHeight)); + } + + $(this).change(update).keyup(update).keydown(update); + + update.apply(this); + + }); + + return this; + + } + +})(jQuery);
\ No newline at end of file diff --git a/view/theme/dispy/lang_selector.tpl b/view/theme/dispy/lang_selector.tpl new file mode 100644 index 000000000..e777a0a86 --- /dev/null +++ b/view/theme/dispy/lang_selector.tpl @@ -0,0 +1,10 @@ +<div id="lang-select-icon" class="icon s22 language" title="$title" onclick="openClose('language-selector');" ></div> +<div id="language-selector" style="display: none;" > + <form action="#" method="post" > + <select name="system_language" onchange="this.form.submit();" > + {{ for $langs.0 as $v=>$l }} + <option value="$v" {{if $v==$langs.1}}selected="selected"{{endif}}>$l</option> + {{ endfor }} + </select> + </form> +</div> diff --git a/view/theme/dispy/nav.tpl b/view/theme/dispy/nav.tpl index b58ae7e3a..6ffd2b379 100644 --- a/view/theme/dispy/nav.tpl +++ b/view/theme/dispy/nav.tpl @@ -1,49 +1,53 @@ -<nav> +<nav id="pagenav"> <span id="banner">$banner</span> -<!-- yes, they're going the other way. seems that's how the template renderer -works --> <a name="top" id="top"></a> <div id="nav-floater"> - <div id="nav-buttons"> - {{ if $nav.help }} - <a id="nav-help-link" class="nav-link $nav.help.2" href="$nav.help.0" title="$nav.help.1">$nav.help.1</a> - {{ endif }} - {{ if $nav.community }} - <a id="nav-community-link" class="nav-link $nav.community.2" - href="$nav.community.0" title="$nav.community.1">$nav.community.1</a> + <ul id="nav-buttons"> + {{ if $nav.login }} + <li><a id="nav-login-link" class="nav-login-link $nav.login.2" + href="$nav.login.0" title="$nav.login.3" >$nav.login.1</a></li> {{ endif }} - {{ if $nav.apps }} - <a id="nav-apps-link" class="nav-link $nav.apps.2" href="$nav.apps.0" title="$nav.apps.1">$nav.apps.1</a> + {{ if $nav.home }} + <li><a id="nav-home-link" class="nav-link $nav.home.2" + href="$nav.home.0" title="$nav.home.1">$nav.home.1</a></li> {{ endif }} - <a id="nav-directory-link" class="nav-link $nav.directory.2" href="$nav.directory.0" title="$nav.directory.1">$nav.directory.1</a> - <a id="nav-search-link" class="nav-link $nav.search.2" href="$nav.search.0" title="$nav.search.1">$nav.search.1</a> - {{ if $nav.messages }} - <a id="nav-messages-link" class="nav-link $nav.messages.2" - href="$nav.messages.0" title="$nav.messages.1">$nav.messages.1</a> + {{ if $nav.network }} + <li><a id="nav-network-link" class="nav-link $nav.network.2" + href="$nav.network.0" title="$nav.network.1">$nav.network.1</a></li> {{ endif }} {{ if $nav.notifications }} - <a id="nav-notifications-linkmenu" class="nav-link $nav.notifications.2" href="$nav.notifications.0" rel="#nav-notifications-menu" title="$nav.notifications.1">$nav.notifications.1</a> - <ul id="nav-notifications-menu" class="menu-popup"> - <li id="nav-notifications-see-all"><a href="$nav.notifications.all.0">$nav.notifications.all.1</a></li> - <li id="nav-notifications-mark-all"><a href="#" onclick="notifyMarkAll(); return false;">$nav.notifications.mark.1</a></li> - <li class="empty">$emptynotifications</li> - </ul> + <li><a id="nav-notifications-linkmenu" class="nav-link $nav.notifications.2" + href="$nav.notifications.0" + rel="#nav-notifications-menu" title="$nav.notifications.1">$nav.notifications.1</a></li> + <ul id="nav-notifications-menu" class="menu-popup"> + <li id="nav-notifications-see-all"><a href="$nav.notifications.all.0">$nav.notifications.all.1</a></li> + <li id="nav-notifications-mark-all"><a href="#" onclick="notifyMarkAll(); return false;">$nav.notifications.mark.1</a></li> + <li class="empty">$emptynotifications</li> + </ul> {{ endif }} - {{ if $nav.network }} - <a id="nav-network-link" class="nav-link $nav.network.2" - href="$nav.network.0" title="$nav.network.1">$nav.network.1</a> + {{ if $nav.messages }} + <li><a id="nav-messages-link" class="nav-link $nav.messages.2" + href="$nav.messages.0" title="$nav.messages.1">$nav.messages.1</a></li> {{ endif }} - {{ if $nav.home }} - <a id="nav-home-link" class="nav-link $nav.home.2" - href="$nav.home.0" title="$nav.home.1">$nav.home.1</a> + {{ if $nav.community }} + <li><a id="nav-community-link" class="nav-link $nav.community.2" + href="$nav.community.0" title="$nav.community.1">$nav.community.1</a></li> {{ endif }} - {{ if $nav.login }} - <a id="nav-login-link" class="nav-login-link $nav.login.2" - href="$nav.login.0" title="$nav.login.3" >$nav.login.1</a> + <li><a id="nav-directory-link" class="nav-link $nav.directory.2" + href="$nav.directory.0" title="$nav.directory.1">$nav.directory.1</a></li> + <li><a id="nav-search-link" class="nav-link $nav.search.2" + href="$nav.search.0" title="$nav.search.1">$nav.search.1</a></li> + {{ if $nav.apps }} + <li><a id="nav-apps-link" class="nav-link $nav.apps.2" + href="$nav.apps.0" title="$nav.apps.1">$nav.apps.1</a></li> + {{ endif }} + {{ if $nav.help }} + <li><a id="nav-help-link" class="nav-link $nav.help.2" + href="$nav.help.0" title="$nav.help.1">$nav.help.1</a></li> {{ endif }} - </div> + </ul> <div id="user-menu"> <a id="user-menu-label" onclick="openClose('user-menu-popup'); return false" href="$nav.home.0">$sitelocation</a> diff --git a/view/theme/dispy/style.css b/view/theme/dispy/style.css index 47e1d1132..8823bc81a 100644 --- a/view/theme/dispy/style.css +++ b/view/theme/dispy/style.css @@ -9,11 +9,22 @@ /* from html5boilerplate */ /* these are to tell browsers they should be displayed a certain way */ -article, aside, details, figcaption, figure, footer, -header, hgroup, nav, section { +article, +aside, +details, +figcaption, +figure, +footer, +header, +hgroup, +nav, +section { display: block; } -audio, canvas, video, time { +audio, +canvas, +video, +time { display: inline-block; *display: inline; *zoom: 1; @@ -46,31 +57,42 @@ body { font-size: 16px; line-height: 1.1em; } -body, button, input, select, textarea { +body, +button, +input, +select, +textarea { font-family: sans-serif; color: #222; - background-color: #efefef; + background-color: #e8e8e8; } select { - border: 1px #555 dotted; - padding: 3px; - margin: 2px; - color: #222; - background: #efefef; + border: 1px #555 dotted; + padding: 3px; + margin: 3px; + color: #222; + background: #e8e8e8; } option { - padding: 3px; - vertical-align: middle; - color: #222; - background: #efefef; + padding: 3px; + color: #222; + background: #e8e8e8; +} +option[selected="selected"] { + color: #111; + background: #cca; } ul, ol { - padding: 0; + padding: 0; } /* remember to define focus styles! */ :focus { outline: 0; } +[disabled="disabled"] { + background: #ddd; + color: #333; +} /* remember to highlight inserts somehow! */ ins { @@ -135,7 +157,7 @@ a:hover img { } blockquote { background: #eee; - color: #111; + color: #111; text-indent: 5px; padding: 5px; border: 1px #aaa solid; @@ -159,36 +181,25 @@ a:hover { .fakelink:hover { color: #729fcf; } -input[type=submit] { - background-color: #555753; - color: #eeeeec; - font-weight: bold; - margin-top: 10px; - height: 22px; - -webkit-border-radius: 5px; - -moz-border-radius: 5px; - border-radius: 5px; - border: 0; -} .smalltext { font-size: 0.7em; } #panel { - position: absolute; - font-size: 0.8em; - -webkit-border-radius: 5px; - -moz-border-radius: 5px; - border-radius: 5px; - border: 1px solid #fff; - background-color: #2e3436; - color: #eeeeec; - padding: 1em; + position: absolute; + font-size: 0.8em; + -webkit-border-radius: 5px; + -moz-border-radius: 5px; + border-radius: 5px; + border: 1px solid #fff; + background-color: #2e3436; + color: #eeeeec; + padding: 1em; } .pager { - margin-top: 60px; - display: block; - clear: both; - text-align: center; + margin-top: 60px; + display: block; + clear: both; + text-align: center; } .pager span { padding: 4px; @@ -205,25 +216,25 @@ input[type=submit] { */ /* .tool .action */ .action { - margin: 5px 0; + margin: 5px 0; } .tool { - margin: 5px 0; - list-style: none; + margin: 5px 0; + list-style: none; } #articlemain { - width: 100%; - height: 100%; - margin: 0 auto; + width: 100%; + height: 100%; + margin: 0 auto; } /** - * login + * login */ #asidemain .field { - overflow: hidden; - width: 200px; + overflow: hidden; + width: 200px; } #login-extra-links { overflow: auto !important; @@ -238,34 +249,34 @@ input[type=submit] { float: none !important; height: 100% !important; position: relative !important; - width: 100% !important; + width: 100% !important; } #login_standard .field label { - width: 200px !important; + width: 200px !important; } #login_standard input, #login_standard input[type="text"] { - margin: 0 0 8px !important; + margin: 0 0 8px !important; width: 210px !important; } #login-submit-wrapper { - margin: 0 !important; + margin: 0 !important; } #login-submit-button { margin-left: 0px !important; } #asidemain #login_openid { - position: relative !important; - float: none !important; - margin-left: 0px !important; - height: auto !important; - width: 200px !important; + position: relative !important; + float: none !important; + margin-left: 0px !important; + height: auto !important; + width: 200px !important; } #login_openid #id_openid_url { - width: 180px !important; - overflow: hidden !important; + width: 180px !important; + overflow: hidden !important; } #login_openid label { - width: 180px !important; + width: 180px !important; } @@ -273,77 +284,76 @@ input[type=submit] { * nav */ nav { - height: 60px; - background-color: #2e3436; - color: #eeeeec; - position: relative; - padding: 20px 20px 10px 95px; + height: 60px; + background-color: #2e3436; + color: #eeeeec; + position: relative; + padding: 20px 20px 10px 95px; } nav a { - text-decoration: none; - color: #eeeeec; - border: 0px; + text-decoration: none; + color: #eeeeec; + border: 0px; } nav a:hover { - text-decoration: none; - color: #eeeeec; + text-decoration: none; + color: #eeeeec; border: 0px; } nav #banner { - display: block; - position: absolute; - left: 51px; - top: 25px; + display: block; + position: absolute; + left: 51px; + top: 25px; } nav #banner #logo-text a { - font-size: 40px; - font-weight: bold; - margin-left: 3px; + font-size: 40px; + font-weight: bold; + margin-left: 3px; } ul#user-menu-popup { - display: none; - position: absolute; - background-color: #555753; - width: 100%; + display: none; + position: absolute; + background-color: #555753; + width: 100%; padding: 10px 0px; margin: 0px; - top: 20px; - left: 0; - -webkit-border-radius: 0 0 5px 5px; - -moz-border-radius: 0 0 5px 5px; - border-radius: 0 0 5px 5px; - box-shadow: 5px 10px 10px 0 #111; - z-index: 10000; + top: 20px; + left: 0; + -webkit-border-radius: 0 0 5px 5px; + -moz-border-radius: 0 0 5px 5px; + border-radius: 0 0 5px 5px; + box-shadow: 5px 10px 10px 0 #111; + z-index: 10000; } ul#user-menu-popup li { - display: block; + display: block; } ul#user-menu-popup li a { - display: block; - padding: 5px; + display: block; + padding: 5px; } ul#user-menu-popup li a:hover { - color: #2e3436; - background-color: #eeeeec; + color: #2e3436; + background-color: #eeeeec; } ul#user-menu-popup li a.nav-sep { - border-top: 1px solid #eeeeec; + border-top: 1px solid #eeeeec; } nav .nav-link { - float: right; - display: block; - width: 22px; - height: 22px; - overflow: hidden; - margin: 0px 5px 5px; - text-indent: 50px; - background: transparent url(icons.png) 0 0 no-repeat; + display: inline-block; + width: 22px; + height: 22px; + overflow: hidden; + margin: 0px 5px 5px; + text-indent: 50px; + background: transparent url(icons.png) 0 0 no-repeat; } #nav-apps-link { - background-position: 0 -66px; + background-position: 0 -66px; } #nav-apps-link:hover { - background-position: -22px -66px; + background-position: -22px -66px; } #nav-community-link { background-position: 0 -22px; @@ -358,16 +368,16 @@ nav .nav-link { background-position: -22px -22px; } #nav-directory-link { - background-position: -44px -154px; + background-position: -44px -154px; } #nav-directory-link:hover { - background-position: -66px -154px; + background-position: -66px -154px; } #nav-help-link { - background-position: 0 -110px; + background-position: 0 -110px; } #nav-help-link:hover { - background-position: -22px -110px; + background-position: -22px -110px; } #nav-home-link { background-position: -44px -132px; @@ -376,22 +386,22 @@ nav .nav-link { background-position: -66px -132px; } #nav-intro-link { - background-position: 0px -190px; + background-position: 0px -190px; } #nav-intro-link:hover { - background-position: -44px -190px; + background-position: -44px -190px; } #nav-login-link { - background-position: 0 -88px; + background-position: 0 -88px; } #nav-login-link:hover { - background-position: -22px -88px; + background-position: -22px -88px; } #nav-logout-link { - background-position: 0 -88px; + background-position: 0 -88px; } #nav-logout-link:hover { - background-position: -22px -88px; + background-position: -22px -88px; } #nav-messages-link { background-position: -44px -88px; @@ -412,10 +422,10 @@ nav .nav-link { background-position: -22px -177px; } #nav-search-link { - background-position: 0 -44px; + background-position: 0 -44px; } #nav-search-link:hover { - background-position: -22px -44px; + background-position: -22px -44px; } #profile-link, #profile-title, @@ -436,6 +446,8 @@ nav .nav-link { .icon, .hover, .focus, .pointer { cursor: pointer; } + + /* popup notifications */ div.jGrowl div.notice { background: #511919 url("../../../images/icons/48/notice.png") no-repeat 5px center; @@ -467,7 +479,6 @@ div.jGrowl div.info { display: block; } #nav-notifications-menu li { - padding: 7px 0px 7px 10px; word-wrap: normal; border-bottom: 1px solid #000; } @@ -478,18 +489,19 @@ div.jGrowl div.info { color: black; text-decoration: underline; } -nav #nav-notifications-linkmenu.on .icon.s22.notify, nav #nav-notifications-linkmenu.selected .icon.s22.notify { - background-image: url("../../../images/icons/22/notify_on.png"); +nav #nav-notifications-linkmenu.on .icon.s22.notify, +nav #nav-notifications-linkmenu.selected .icon.s22.notify { + background-image: url("../../../images/icons/22/notify_on.png"); } .show { display: block; } #notifications { - height: 20px; - width: 170px; - position: absolute; - top: -19px; - left: 7px; + height: 20px; + width: 170px; + position: absolute; + top: -19px; + left: 4px; } #nav-floater { position: fixed; @@ -497,132 +509,135 @@ nav #nav-notifications-linkmenu.on .icon.s22.notify, nav #nav-notifications-link right: 1%; padding: 5px; background: #2e3436; - color: transparent; + color: transparent; border-radius: 5px; z-index: 100; - width: 300px; - height: 60px; + width: 300px; + height: 60px; } #nav-buttons { clear: both; - list-style: none; - padding: 0px; - margin: 0 7px 0 0; - height: 25px; + list-style: none; + padding: 0px; + margin: 0px; + height: 25px; } -#nav-buttons li { - padding: 0; +#nav-buttons > li { + padding: 0; + display: inline-block; + margin: 0px -4px 0px 0px; } .floaterflip { - display: block; + display: block; position: fixed; z-index: 110; top: 56px; right: 19px; - width: 22px; - height: 22px; - overflow: hidden; - margin: 0px; - background: transparent url(icons.png) -190px -60px no-repeat; + width: 22px; + height: 22px; + overflow: hidden; + margin: 0px; + background: transparent url(icons.png) -190px -60px no-repeat; } .search-box { - display: inline-block; - margin: 5px; - position: fixed; - right: 0px; - bottom: 0px; - z-index: 100; - background: #1d1f1d; - border-radius: 5px; + display: inline-block; + margin: 5px; + position: fixed; + right: 0px; + bottom: 0px; + z-index: 100; + background: #1d1f1d; + border-radius: 5px; } #search-text { - border: 1px #eec solid; - background: #2e3436; - color: #eec; + border: 1px #eec solid; + background: #2e3436; + color: #eec; } .search-box #search-text { - margin: 8px; - width: 10em; - color: #eec; + margin: 8px; + width: 10em; + height: 14px; + color: #eec; } #scrollup { - position: fixed; - right: 5px; - bottom: 40px; - z-index: 100; + position: fixed; + right: 5px; + bottom: 40px; + z-index: 100; } #scrollup a:hover { - text-decoration: none; - border: 0; + text-decoration: none; + border: 0; } #user-menu { - box-shadow: 5px 0 10px 0 #111; + box-shadow: 5px 0 10px 0 #111; display: block; width: 75%; margin: 3px 0 0 0; position: relative; - background-color: #555753; + background-color: #555753; -webkit-border-radius: 5px; -moz-border-radius: 5px; border-radius: 5px; background: #555753 url("menu-user-pin.jpg") 98% center no-repeat; clear: both; - top: 4px; - left: 10px; - padding: 2px; + top: 4px; + left: 10px; + padding: 2px; } #user-menu > a { - vertical-align: top; + vertical-align: top; } #user-menu-label { - font-size: 12px; + font-size: 12px; padding: 3px 20px 9px 5px; height: 10px; } .nav-ajax-update, .nav-ajax-left { - width: 30px; - height: 19px; - background: transparent url(notifications.png) 0 0 no-repeat; - color: #222; - font-weight: bold; - font-size: 0.8em; - padding-top: 0.2em; - text-align: center; - float: left; - margin: 0 -1px 0 3px; - display: block; - visibility: hidden; + width: 30px; + height: 19px; + background: transparent url(notifications.png) 0 0 no-repeat; + color: #222; + font-weight: bold; + font-size: 0.8em; + padding-top: 0.2em; + text-align: center; + float: left; + margin: 0 -1px 0 3px; + display: block; + visibility: hidden; } .nav-ajax-update.show, .nav-ajax-left.show { visibility: visible; } #net-update { - background-position: 0px 0px; + background-position: 0px 0px; } #mail-update { - background-position: -30px 0; + background-position: -30px 0; } #notify-update { - background-position: -60px 0px; + background-position: -60px 0px; } #home-update { - background-position: -90px 0px; + background-position: -90px 0px; } #intro-update { - background-position: -120px 0px; + background-position: -120px 0px; } #lang-select-icon { - cursor: pointer; - position: fixed; - left: 28px; - bottom: 6px; - z-index: 10; + cursor: pointer; + position: fixed; + left: 28px; + bottom: 6px; + z-index: 10; } #language-selector { position: fixed; bottom: 2px; left: 52px; - z-index: 10; + z-index: 10; } .menu-popup { position: absolute; @@ -684,133 +699,135 @@ nav #nav-notifications-linkmenu.on .icon.s22.notify, nav #nav-notifications-link } -/** sysmsg **/ +/** + * sysmsg + */ #sysmsg_info { - position: fixed; - bottom: 0; - -moz-box-shadow: 3px 3px 3px 10px 0 #000; - -webkit-box-shadow: 3px 3px 10px 0 #000; - box-shadow: 3px 3px 10px 0 #000; + position: fixed; + bottom: 0; + -moz-box-shadow: 3px 3px 3px 10px 0 #000; + -webkit-box-shadow: 3px 3px 10px 0 #000; + box-shadow: 3px 3px 10px 0 #000; padding: 10px; - background-color: #fcaf3e; - border:2px solid #f8911b; - border-bottom: 0; - padding-bottom: 50px; - z-index: 1000; + background-color: #fcaf3e; + border:2px solid #f8911b; + border-bottom: 0; + padding-bottom: 50px; + z-index: 1000; } #sysmsg { - position: fixed; - bottom: 0; - -moz-box-shadow: 3px 3px 10px 0 #000; - -webkit-box-shadow: 3px 3px 10px 0 #000; - box-shadow: 3px 3px 10px 0 #000; + position: fixed; + bottom: 0; + -moz-box-shadow: 3px 3px 10px 0 #000; + -webkit-box-shadow: 3px 3px 10px 0 #000; + box-shadow: 3px 3px 10px 0 #000; padding: 10px; - background-color: #fcaf3e; - border: 2px solid #f8911b; - border-bottom: 0; - padding-bottom: 50px; - z-index: 1000; + background-color: #fcaf3e; + border: 2px solid #f8911b; + border-bottom: 0; + padding-bottom: 50px; + z-index: 1000; } #sysmsg_info br, #sysmsg br { - display: block; - margin: 2px 0px; - border-top: 1px solid #ccccce; + display: block; + margin: 2px 0px; + border-top: 1px solid #ccccce; } /** -* aside -**/ + * aside + */ #asidemain { - float: left; + float: left; font-size: smaller; margin: 20px 0 20px 35px; width: 25%; - display: inline; + display: inline; } /* for now, disappear these */ #asideright, #asideleft { - display: none; + display: none; } .vcard .fn { - font-size: 1.7em; - font-weight: bold; - border-bottom: 1px solid #729fcf; - padding-bottom: 3px; + font-size: 1.7em; + font-weight: bold; + border-bottom: 1px solid #729fcf; + padding-bottom: 3px; } .vcard #profile-photo-wrapper { - margin: 20px; + margin: 20px; } /* http://css-tricks.com/snippets/css/css-box-shadow/ - * box-shadow: - * 1. The horizontal offset of the shadow, positive means - * the shadow will be on the right of the box, a negative - * offset will put the shadow on the left of the box. - * 2. The vertical offset of the shadow, a negative one - * means the box-shadow will be above the box, a - * positive one means the shadow will be below the box. - * 3. The blur radius (optional), if set to 0 the shadow - * will be sharp, the higher the number, the more blurred - * it will be. - * 4. The spread radius (optional), positive values increase - * the size of the shadow, negative values decrease the size. - * Default is 0 (the shadow is same size as blur). - * 5. Colo[u]r - */ +* box-shadow: +* 1. The horizontal offset of the shadow, positive means +* the shadow will be on the right of the box, a negative +* offset will put the shadow on the left of the box. +* 2. The vertical offset of the shadow, a negative one +* means the box-shadow will be above the box, a +* positive one means the shadow will be below the box. +* 3. The blur radius (optional), if set to 0 the shadow +* will be sharp, the higher the number, the more blurred +* it will be. +* 4. The spread radius (optional), positive values increase +* the size of the shadow, negative values decrease the size. +* Default is 0 (the shadow is same size as blur). +* 5. Colo[u]r +*/ .vcard #profile-photo-wrapper img { - box-shadow: 3px 3px 10px 0 #000; + box-shadow: 3px 3px 10px 0 #000; } #asidemain h4 { - font-size: 1.2em; + font-size: 1.2em; } #asidemain #viewcontacts { - text-align: right; + text-align: right; } .aprofile dt { - background: transparent; - color: #666666; - font-weight: bold; + background: transparent; + color: #666666; + font-weight: bold; box-shadow: 1px 1px 5px 0 #000; margin: 15px 0 5px; padding-left: 5px; } #profile-extra-links ul { - margin-left: 0px; + margin-left: 0px; padding-left: 0px; list-style: none; } #dfrn-request-link { - background: #3465A4 url(connect.png) no-repeat 95% center; - border-radius: 5px 5px 5px 5px; - color: #fff; - display: block; - font-size: 1.2em; - padding: 0.2em 0.5em; + background: #3465A4 url(connect.png) no-repeat 95% center; + border-radius: 5px 5px 5px 5px; + color: #fff; + display: block; + font-size: 1.2em; + padding: 0.2em 0.5em; } #wallmessage-link { - /*background: #3465A4 url(connect.png) no-repeat 95% center;*/ - /*border-radius: 5px 5px 5px 5px;*/ - color: #eee; - display: block; - font-size: 1.2em; - padding: 0.2em 0.5em; + /*background: #3465A4 url(connect.png) no-repeat 95% center;*/ + /*border-radius: 5px 5px 5px 5px;*/ + color: #eee; + display: block; + font-size: 1.2em; + padding: 0.2em 0.5em; } #netsearch-box { - margin: 20px 0px 30px; + margin: 20px 0px 30px; width: 150px; } #netsearch-box #search-submit { margin: 5px 5px 0px 0px; } .ttright { - margin: 0px 0px 0px 0px; + margin: 0px 0px 0px 0px; } /** -* contacts block -*/ + * contacts block + */ .contact-block-div { width: 50px; height: 50px; @@ -828,20 +845,20 @@ nav #nav-notifications-linkmenu.on .icon.s22.notify, nav #nav-notifications-link /** * jot - **/ + */ #jot { - /*width: 785px;*/ - margin: 10px 0 20px 0px; - width: 100%; +/*width: 785px;*/ +margin: 10px 0 20px 0px; +width: 100%; } #jot #jot-tools { - margin: 0px; - padding: 0px; - height: 35px; - overflow: none; - width: 100%; - /*background-color: #0e232e;*/ - /*border-bottom: 2px solid #9eabb0;*/ +margin: 0px; +padding: 0px; +height: 35px; +overflow: none; +width: 100%; +/*background-color: #0e232e;*/ +/*border-bottom: 2px solid #9eabb0;*/ } #jot #jot-tools span { float: left; @@ -867,67 +884,67 @@ nav #nav-notifications-linkmenu.on .icon.s22.notify, nav #nav-notifications-link margin-top: 10px; } #jot #jot-title { - border: 1px solid #ccc; + border: 1px solid #ccc; margin: 0 0 5px; height: 20px; width: 90%; font-weight: bold; border-radius: 5px; - vertical-align: middle; + vertical-align: middle; } #jot-category { - margin: 5px 0; - border-radius: 5px; - border: 1px #ccc solid; - color: #666; - font-size: small; + margin: 5px 0; + border-radius: 5px; + border: 1px #ccc solid; + color: #666; + font-size: smaller; } #jot-category:focus { - color: #111; + color: #111; } #jot #character-counter { - width: 6%; - float: right; - text-align: right; - height: 15px; - line-height: 20px; - padding: 2px 20px 5px 0; + width: 6%; + float: right; + text-align: right; + height: 15px; + line-height: 20px; + padding: 2px 20px 5px 0; } #profile-jot-text_parent { - /*border-radius: 10px;*/ - box-shadow: 5px 0 10px 0 #111; + /*border-radius: 10px;*/ + box-shadow: 5px 0 10px 0 #111; } #profile-jot-text_tbl { - margin-bottom: 10px; - /*border-radius: 10px;*/ - background: #888; + margin-bottom: 10px; + /*border-radius: 10px;*/ + background: #888; } #profile-jot-text_ifr { - width:99.900002% !important; + width:99.900002% !important; } #profile-jot-text_toolbargroup { - background: #888; + background: #888; } .mceCenter table tr { - background: #888; + background: #888; } [id$="jot-text_ifr"] { - width: 99.900002% !important; - color: #2e2f2e; - background: #eec; + width: 99.900002% !important; + color: #2e2f2e; + background: #eec; } [id$="jot-text_ifr"] .mceContentBody { - color: #2e2f2e; - background: #eec; + color: #2e2f2e; + background: #eec; } .mceFirst tr { - background: #888; + background: #888; } .mceFirst td { - /*border-radius: 10px 10px 0px 0px;*/ + /*border-radius: 10px 10px 0px 0px;*/ } .mceLast td { - /*border-radius: 0 0 10px 10px;*/ + /*border-radius: 0 0 10px 10px;*/ } #profile-attach-wrapper, #profile-audio-wrapper, @@ -938,58 +955,58 @@ nav #nav-notifications-linkmenu.on .icon.s22.notify, nav #nav-notifications-link #profile-upload-wrapper, #profile-video-wrapper { float: left; - margin: 0 20px 0 0; + margin: 0 20px 0 0; } #profile-rotator-wrapper { - float: right; + float: right; } #profile-jot-tools-end, #profile-jot-banner-end { - clear: both; + clear: both; } #profile-jot-email-wrapper { - margin:10px 10% 0; - border:1px solid #555753; - border-bottom:0; + margin:10px 10% 0; + border:1px solid #555753; + border-bottom:0; } #profile-jot-email-label { - background-color:#555753; - color:#ccccce; - padding:5px; + background-color:#555753; + color:#ccccce; + padding:5px; } #profile-jot-email { - width:90%; - margin:5px; + width:90%; + margin:5px; } #profile-jot-networks { - margin: 0 10%; - border: 1px solid #555753; - border-top: 0; - border-bottom: 0; - padding: 5px; + margin: 0 10%; + border: 1px solid #555753; + border-top: 0; + border-bottom: 0; + padding: 5px; } #profile-jot-net { - margin: 5px 0; + margin: 5px 0; } #jot-preview-link { margin: 0 0 0 10px; border: 0; text-decoration: none; - float: right; + float: right; } .icon-text-preview { - margin: 0 0 -18px 0; - display: block; + margin: 0 0 -18px 0; + display: block; width: 20px; height: 20px; background: url(icons.png) no-repeat -128px -40px; border: 0; text-decoration: none; - float: right; - cursor: pointer; + float: right; + cursor: pointer; } #profile-jot-perms { - float: right; + float: right; background-color: #555753; height: 22px; width: 20px; @@ -1001,103 +1018,108 @@ nav #nav-notifications-linkmenu.on .icon.s22.notify, nav #nav-notifications-link margin: 0 10px 0 10px; } #profile-jot-plugin-wrapper { - width: 1px; - margin: 10px 0 0 0; - float: right; + width: 1px; + margin: 10px 0 0 0; + float: right; } #profile-jot-submit-wrapper { - float: right; - width: 100%; - list-style: none; - margin: 10px 0 0 0; - padding: 0; + float: right; + width: 100%; + list-style: none; + margin: 10px 0 0 0; + padding: 0; } #profile-jot-submit { - height: 22px; - background-color: #555753; - color: #eeeeec; - -webkit-border-radius: 5px; - -moz-border-radius: 5px; - border-radius: 5px; - border: 0; - margin: 0; - float: right; + height: auto; + background-color: #555753; + color: #eeeeec; + -webkit-border-radius: 5px; + -moz-border-radius: 5px; + border-radius: 5px; + border: 2px outset #222420; + margin: 0; + float: right; + text-shadow: 1px 1px #111; + width: auto; +} +#profile-jot-submit:active { + box-shadow: 0 0 0 0; } #jot-perms-icon { - height: 22px; - width: 20px; - -webkit-border-radius: 5px; - -moz-border-radius: 5px; - border-radius: 5px; - overflow: hidden; - border: 0; + height: 22px; + width: 20px; + -webkit-border-radius: 5px; + -moz-border-radius: 5px; + border-radius: 5px; + overflow: hidden; + border: 0; } #profile-jot-acl-wrapper { - margin: 0 10px; - border: 1px solid #555753; - border-top: 0; - display: block !important; + margin: 0 10px; + border: 1px solid #555753; + border-top: 0; + display: block !important; } #group_allow_wrapper, #group_deny_wrapper, #acl-permit-outer-wrapper { - width:47%; - float:left; + width:47%; + float:left; } #contact_allow_wrapper, #contact_deny_wrapper, #acl-deny-outer-wrapper { - width:47%; - float:right; + width:47%; + float:right; } #acl-permit-text { - background-color: #555753; - color: #ccccce; - padding: 5px; - float: left; + background-color: #555753; + color: #ccccce; + padding: 5px; + float: left; } #jot-public { - background-color: #555753; - color: #ff0000; - padding: 5px; - float: left; + background-color: #555753; + color: #ff0000; + padding: 5px; + float: left; } #acl-deny-text { - background-color: #555753; - color: #ccccce; - padding: 5px; - float: left; + background-color: #555753; + color: #ccccce; + padding: 5px; + float: left; } #acl-permit-text-end, #acl-deny-text-end { - clear: both; + clear: both; } #jot-title-desc { - color: #ccc; + color: #ccc; } #profile-jot-desc { - color: #a00; - margin: 5px 0; + color: #a00; + margin: 5px 0; } #jot-title-wrapper { - margin-bottom: 5px; + margin-bottom: 5px; } #jot-title-display { - font-weight: bold; + font-weight: bold; } .jothidden { display: none; } #jot-preview-content { background-color: #ffffe0; - color: #111; + color: #111; border: 1px #aa0 solid; border-radius: 5px; padding: 3px 3px 6px 10px; } #jot-preview-content .wall-item-outside-wrapper { - border: 0; - border-radius: 0px; + border: 0; + border-radius: 0px; } @@ -1107,13 +1129,16 @@ nav #nav-notifications-linkmenu.on .icon.s22.notify, nav #nav-notifications-link #sectionmain { margin: 20px; font-size: 0.8em; - min-width: 475px; - width: 67%; - float: left; - display: inline; + min-width: 475px; + width: 67%; + float: left; + display: inline; } -/** tabs **/ + +/** + * tabs + */ .tabs { list-style: none; margin: 10px 0; @@ -1121,12 +1146,12 @@ nav #nav-notifications-linkmenu.on .icon.s22.notify, nav #nav-notifications-link } .tabs li { display: inline; - font-size: smaller; - font-weight: bold; + font-size: smaller; + font-weight: bold; } .tab { border: 1px solid #729fcf; - padding: 4px; + padding: 4px; } .tab:hover, .tab.active:hover { background: #729fcf; @@ -1137,60 +1162,60 @@ nav #nav-notifications-linkmenu.on .icon.s22.notify, nav #nav-notifications-link color: #eeeeec; } .tab.active { - background: #729fcf; + background: #729fcf; color: #eeeeec; } .tab.active a { - color: #729fcf; + color: #729fcf; } .tab a { - border: 0; - text-decoration: none; + border: 0; + text-decoration: none; } /** - * items + * items */ .wall-item-outside-wrapper { - border: 1px solid #aaa; - border-radius: 5px; - box-shadow: 5px 0 10px 0 #999; + border: 1px solid #aaa; + border-radius: 5px; + box-shadow: 5px 0 10px 0 #888; } .wall-item-outside-wrapper.comment { - margin-top: 5px; + margin-top: 5px; } .wall-item-outside-wrapper-end { clear: both; } .wall-item-content-wrapper { position: relative; - padding: 10px; - width: auto; + padding: 10px; + width: auto; } .wall-item-outside-wrapper .wall-item-comment-wrapper { /*margin-left: 90px;*/ } .shiny { background: #efefdf; - border-radius: 5px; + border-radius: 5px; } .wall-outside-wrapper .shiny { - border-radius: 5px; + border-radius: 5px; } .heart { - color: red; + color: red; } .wall-item-content { - overflow-x: auto; - margin: 0px 15px 0px 5px; + overflow-x: auto; + margin: 0px 15px 0px 5px; } /* removing it from here, vs. putting it in .wall-item-content - * might break things for people. we shall see ;) */ +* might break things for people. we shall see ;) */ [id^="tread-wrapper"], [class^="tread-wrapper"] { margin: 15px 0 0 0; padding: 0px; - /*overflow-x: auto;*/ + /*overflow-x: auto;*/ } .wall-item-photo-menu { display: none; @@ -1224,7 +1249,7 @@ nav #nav-notifications-linkmenu.on .icon.s22.notify, nav #nav-notifications-link border-radius: 5px; } [class^="wall-item-tools"] > *, [class^="wall-item-tools"] > * > * { - /*margin: 0 0 5px 0;*/ + /*margin: 0 0 5px 0;*/ } .wall-item-tools { float: right; @@ -1260,41 +1285,41 @@ nav #nav-notifications-linkmenu.on .icon.s22.notify, nav #nav-notifications-link width: 25px; } .wall-item-title { - font-size: 1.2em; - font-weight: bold; + font-size: 1.2em; + font-weight: bold; margin-bottom: 1em; } .wall-item-body { - margin: 20px 20px 10px 0px; + margin: 20px 20px 10px 0px; text-align: left; - overflow-x: auto; + overflow-x: auto; } .wall-item-lock-wrapper { - float: right; + float: right; height: 22px; margin: 0 -5px 0 0; width: 22px; - opacity: 1; + opacity: 1; } .wall-item-dislike, .wall-item-like { - clear: left; - font-size: 0.8em; - color: #878883; - margin: 5px 0 5px 120px; + clear: left; + font-size: 0.8em; + color: #878883; + margin: 5px 0 5px 120px; } .wall-item-author, .wall-item-actions-author { - clear: left; - font-size: 0.8em; - color: #878883; - margin: 20px 20px 0 110px; + clear: left; + font-size: 0.8em; + color: #878883; + margin: 20px 20px 0 110px; } .wall-item-ago { - display: inline; - padding-left: 10px; + display: inline; + padding-left: 10px; } .wall-item-wrapper-end { - clear:both; + clear:both; } .wall-item-location { margin-top: 15px; @@ -1343,17 +1368,17 @@ nav #nav-notifications-linkmenu.on .icon.s22.notify, nav #nav-notifications-link z-index: 10002; } .wall-item-photo-menu { - min-width: 92px; - border: 2px solid #FFFFFF; - border-top: 0px; - background: #555753; - position: absolute; - left: -2px; top: 101px; - display: none; - z-index: 10003; - -webkit-border-radius: 0px 5px 5px 5px; - -moz-border-radius: 0px 5px 5px 5px; - border-radius: 0px 5px 5px 5px; + min-width: 92px; + border: 2px solid #FFFFFF; + border-top: 0px; + background: #555753; + position: absolute; + left: -2px; top: 101px; + display: none; + z-index: 10003; + -webkit-border-radius: 0px 5px 5px 5px; + -moz-border-radius: 0px 5px 5px 5px; + border-radius: 0px 5px 5px 5px; } .wall-item-photo-menu ul { margin:0px; @@ -1375,27 +1400,27 @@ nav #nav-notifications-linkmenu.on .icon.s22.notify, nav #nav-notifications-link width: 100%; } #connect-services-header { - margin: 5px 0 0 0; + margin: 5px 0 0 0; } #connect-services { - margin: 5px 0 0 0; + margin: 5px 0 0 0; } #extra-help-header { - margin: 5px 0 0 0; + margin: 5px 0 0 0; } #extra-help { - margin: 5px 0 0 0; + margin: 5px 0 0 0; } #postit-header { - margin: 5px 0 0 0; + margin: 5px 0 0 0; } #postit { - margin: 5px 0 0 0; + margin: 5px 0 0 0; } /** - * comment + * comment */ .ccollapse-wrapper { font-size: 0.9em; @@ -1414,7 +1439,7 @@ nav #nav-notifications-linkmenu.on .icon.s22.notify, nav #nav-notifications-link height: 40px; } .wall-item-outside-wrapper.comment .wall-item-photo-menu-button { - width: 50px; + width: 50px; top: 45px; background-position: 35px center; } @@ -1438,14 +1463,24 @@ nav #nav-notifications-linkmenu.on .icon.s22.notify, nav #nav-notifications-link .comment-edit-wrapper { border-top: 1px #aaa solid; } +[class^="comment-edit-bb"] { + list-style: none; + display: none; + margin: -40px 0 5px 60px; + width: 75%; +} +[class^="comment-edit-bb"] > li { + display: inline-block; + margin: 0 10px 0 0; + visibility: none; +} .comment-wwedit-wrapper img, .comment-edit-wrapper img { - width: 20px; - height: 20px; + width: 20px; + height: 20px; } .comment-edit-photo-link, .comment-edit-photo { - float: left; - margin-left: 10px; + margin-left: 10px; } .my-comment-photo { width: 40px; @@ -1457,32 +1492,32 @@ nav #nav-notifications-linkmenu.on .icon.s22.notify, nav #nav-notifications-link width: 84.5%; } .comment-edit-text-empty { - height: 20px; - border: 2px #babdd6 solid; - border-radius: 5px; - color: #babdb6; - -webkit-transition: all 0.5s ease-in-out; - -moz-transition: all 0.5s ease-in-out; - -o-transition: all 0.5s ease-in-out; - -ms-transition: all 0.5s ease-in-out; - transition: all 0.5s ease-in-out; + height: 20px; + border: 2px #babdd6 solid; + border-radius: 5px; + color: #babdb6; + -webkit-transition: all 0.5s ease-in-out; + -moz-transition: all 0.5s ease-in-out; + -o-transition: all 0.5s ease-in-out; + -ms-transition: all 0.5s ease-in-out; + transition: all 0.5s ease-in-out; } .comment-edit-text-empty:hover { - color: #999999; + color: #999999; } .comment-edit-text-full { - height: 10em; + height: 10em; border-radius: 5px; - -webkit-transition: all 0.5s ease-in-out; - -moz-transition: all 0.5s ease-in-out; - -o-transition: all 0.5s ease-in-out; - -ms-transition: all 0.5s ease-in-out; - transition: all 0.5s ease-in-out; + -webkit-transition: all 0.5s ease-in-out; + -moz-transition: all 0.5s ease-in-out; + -o-transition: all 0.5s ease-in-out; + -ms-transition: all 0.5s ease-in-out; + transition: all 0.5s ease-in-out; } .comment-edit-submit-wrapper { - width: 90%; - margin: 5px 5px 10px 50px; - text-align: right; + width: 90%; + margin: 5px 5px 10px 50px; + text-align: right; } .comment-edit-submit { height: 22px; @@ -1497,22 +1532,22 @@ nav #nav-notifications-linkmenu.on .icon.s22.notify, nav #nav-notifications-link /** * item text style - **/ + */ .wall-item-body code { - display: block; - padding: 0 0 10px 5px; - border-color: #ccc; - border-style: solid; - border-width: 1px 1px 1px 10px; - background: #eee; - color: #444; - width: 95%; + display: block; + padding: 0 0 10px 5px; + border-color: #ccc; + border-style: solid; + border-width: 1px 1px 1px 10px; + background: #eee; + color: #444; + width: 95%; } /** * profile - **/ + */ div[id$="text"] { font-weight: bold; border-bottom: 1px solid #ccc; @@ -1524,6 +1559,10 @@ div[id$="wrapper"] { div[id$="wrapper"] br { clear: left; } +[id$="-end"], [class$="end"] { + clear: both; + margin: 0 0 10px 0; +} #advanced-profile-with { margin-left: 200px; } @@ -1531,10 +1570,10 @@ div[id$="wrapper"] br { /** * photos - **/ + */ .photos { - height: auto; - overflow: auto; + height: auto; + overflow: auto; } #photo-top-links { margin-bottom: 30px; @@ -1546,7 +1585,7 @@ div[id$="wrapper"] br { -webkit-box-shadow: 3px 3px 10px 0 #000; box-shadow: 3px 3px 10px 0 #000; background-color: #eee; - color: #111; + color: #111; -webkit-border-radius: 5px; -moz-border-radius: 5px; border-radius: 5px; @@ -1582,11 +1621,8 @@ div[id$="wrapper"] br { margin: 0 5px; } #photo-photo { - position: relative; - float:left; -} -#photo-photo-end { - clear: both; + position: relative; + float:left; } #photo-prev-link, #photo-next-link { @@ -1660,10 +1696,10 @@ div[id$="wrapper"] br { margin-bottom: 15px; } #photo-edit-caption { - width: 100%; + width: 100%; } #photo-edit-newtag { - width: 100%; + width: 100%; } #photo-like-div { margin-bottom: 25px; @@ -1685,15 +1721,15 @@ div[id$="wrapper"] br { } /** - * message + * message */ .prvmail-text { width: 100%; } #prvmail-subject { width: 100%; - color: #eec; - background: #444; + color: #eec; + background: #444; } #prvmail-submit-wrapper { margin-top: 10px; @@ -1717,7 +1753,7 @@ div[id$="wrapper"] br { } .mail-list-sender-name { display: inline; - font-size: 1.1em; + font-size: 1.1em; } .mail-list-date { display: inline; @@ -1725,7 +1761,7 @@ div[id$="wrapper"] br { padding-left: 10px; } .mail-list-sender-name, .mail-list-date { - font-style: italic; + font-style: italic; } .mail-list-subject { font-size: 1.2em; @@ -1735,7 +1771,7 @@ div[id$="wrapper"] br { } .mail-list-outside-wrapper-end { clear: both; - border-bottom: 1px #eec dotted; + border-bottom: 1px #eec dotted; } .mail-conv-sender { float: left; @@ -1765,15 +1801,15 @@ div[id$="wrapper"] br { /** - * contacts + * contacts */ .view-contact-wrapper, .contact-entry-wrapper { float: left; margin: 0 5px 40px 0; width: 120px; - height: 120px; - padding: 3px; + height: 120px; + padding: 3px; position: relative; } .contact-direction-wrapper { @@ -1788,7 +1824,7 @@ div[id$="wrapper"] br { } .contact-entry-photo { - margin-left: 20px; + margin-left: 20px; } .contact-entry-name { width: 120px; @@ -1796,7 +1832,7 @@ div[id$="wrapper"] br { /*overflow: hidden;*/ } .contact-entry-photo { - position: relative; + position: relative; } .contact-entry-edit-links .icon { border: 1px solid #babdb6; @@ -1839,7 +1875,7 @@ div[id$="wrapper"] br { margin-left:5px; } #contact-edit-nav-wrapper .icon { - border: 1px solid #babdb6; + border: 1px solid #babdb6; -webkit-border-radius: 3px; -moz-border-radius: 3px; border-radius: 3px; @@ -1884,7 +1920,7 @@ div[id$="wrapper"] br { width: auto; border: 2px solid #444; background: #eee; - color: #111; + color: #111; position: absolute; left: 0px; top: 90px; display: none; @@ -1907,7 +1943,7 @@ div[id$="wrapper"] br { /** - * register, settings & profile forms + * register, settings & profile forms */ .openid { @@ -1924,7 +1960,7 @@ div[id$="wrapper"] br { -moz-border-radius: 5px; border-radius: 5px; padding: 5px; - color: #111; + color: #111; } #settings-default-perms { margin-bottom: 20px; @@ -1933,7 +1969,15 @@ div[id$="wrapper"] br { #profile-edit-form div { clear: both; } - +.settings-block { + +} +.settings-block label { + clear: left; +} +.settings-block input { + margin: 10px 5px; +} /*#register-form label, */ /*#profile-edit-form label {*/ /* width: 300px; */ @@ -1947,23 +1991,23 @@ div[id$="wrapper"] br { /* margin-bottom: 20px; */ /*} */ #profile-edit-marital-label span { - margin: -4px; + margin: -4px; } .settings-submit-wrapper, .profile-edit-submit-wrapper { margin: 30px 0px; } .profile-edit-side-div { - display: none; + display: none; } /*.profile-edit-side-div:hover { - display: block; + display: block; } .profile-edit-side-link { - margin: 3px 0px 0px 70px; + margin: 3px 0px 0px 70px; }*/ #profiles-menu-trigger { - margin: 0px 0px 0px 25px; + margin: 0px 0px 0px 25px; } .profile-listing { float: left; @@ -1972,16 +2016,16 @@ div[id$="wrapper"] br { .icon-profile-edit { background: url("icons.png") -150px 0px no-repeat; border: 0; - cursor: pointer; + cursor: pointer; display: block; float: right; - width: 20px; + width: 20px; height: 20px; margin: 0 0 -18px; - position: absolute; + position: absolute; text-decoration: none; - top: 113px; - right: 260px; + top: 113px; + right: 260px; } #profile-edit-links ul { margin: 20px 0; @@ -1989,26 +2033,32 @@ div[id$="wrapper"] br { list-style: none; } .marital { - margin-top: 5px; + margin-top: 5px; } #register-sitename { display: inline; font-weight: bold; } #advanced-expire-popup { - background: #2e2f2e; - color: #eec; + background: #2e2f2e; + color: #eec; } #id_ssl_policy { - width: 374px; + width: 374px; +} +#theme-preview { + +} +#theme-preview img { + margin: 10px 10px 10px 288px; } /** - * contacts selector + * contacts selector */ .group-delete-wrapper { - margin: -31px 50px 0 0; + margin: -31px 50px 0 0; float: right; } /*.group-delete-icon { @@ -2131,70 +2181,70 @@ div[id$="wrapper"] br { /** * events - **/ + */ .clear { clear: both; } .eventcal { float:left; font-size:20px; } .event { - background: #2e2f2e; + background: #2e2f2e; } .vevent { border:1px solid #ccc; } .vevent .event-description, .vevent .event-location { - margin-left: 10px; - margin-right: 10px; + margin-left: 10px; + margin-right: 10px; } .vevent .event-start { - margin-left: 10px; - margin-right: 10px; + margin-left: 10px; + margin-right: 10px; } #new-event-link { - margin-bottom: 10px; + margin-bottom: 10px; } .edit-event-link, .plink-event-link { - /*float: left; */ - /*margin-top: 4px; */ - /*margin-right: 4px;*/ - /*margin-bottom: 15px;*/ + /*float: left; */ + /*margin-top: 4px; */ + /*margin-right: 4px;*/ + /*margin-bottom: 15px;*/ } .event-description:before { - content: url('../../../images/calendar.png'); - margin-right: 15px; + content: url('../../../images/calendar.png'); + margin-right: 15px; } .event-start, .event-end { - margin-left: 10px; - width: 330px; - font-size: smaller; + margin-left: 10px; + width: 330px; + font-size: smaller; } .event-start .dtstart, .event-end .dtend { - float: right; + float: right; } .event-list-date { - margin-bottom: 10px; + margin-bottom: 10px; } .prevcal, .nextcal { - float: left; - margin-left: 32px; - margin-right: 32px; - margin-top: 64px; + float: left; + margin-left: 32px; + margin-right: 32px; + margin-top: 64px; } .event-calendar-end { - clear: both; + clear: both; } .calendar { font-family: monospace; } .today { - font-weight: bold; - color: #FF0000; + font-weight: bold; + color: #FF0000; } #event-start-text, #event-finish-text { - margin-top: 10px; - margin-bottom: 5px; + margin-top: 10px; + margin-bottom: 5px; } #event-nofinish-checkbox, #event-nofinish-text, @@ -2204,69 +2254,68 @@ div[id$="wrapper"] br { float:left; } #event-datetime-break { - margin-bottom: 10px; + margin-bottom: 10px; } #event-nofinish-break, #event-adjust-break, #event-share-break { - clear: both; + clear: both; } #event-desc-text, #event-location-text { - margin-top: 10px; - margin-bottom: 5px; + margin-top: 10px; + margin-bottom: 5px; } #event-submit { - margin-top: 10px; + margin-top: 10px; } .body-tag { - margin: 10px 0; - opacity: 0.5; - filter:alpha(opacity=50); + margin: 10px 0; + opacity: 0.5; + filter:alpha(opacity=50); } .body-tag:hover { - opacity: 1.0 !important; - filter:alpha(opacity=100) !important; + opacity: 1.0 !important; + filter:alpha(opacity=100) !important; } .filesavetags, .categorytags { - margin: 20px 0; - opacity: 0.5; - filter:alpha(opacity=50); + margin: 20px 0; + opacity: 0.5; + filter:alpha(opacity=50); } .filesavetags:hover, .categorytags:hover { - margin: 20px 0; - opacity: 1.0 !important; - filter:alpha(opacity=100) !important; + margin: 20px 0; + opacity: 1.0 !important; + filter:alpha(opacity=100) !important; } .item-select { - opacity: 0.1; - filter:alpha(opacity=10); - float: right; - margin-right: 5px; + opacity: 0.1; + filter:alpha(opacity=10); + margin: 5px 0 0 6px !important; } .item-select:hover, .checkeditem { - opacity: 1; - filter:alpha(opacity=100); + opacity: 1; + filter:alpha(opacity=100); } #item-delete-selected { - margin-top: 30px; + margin-top: 30px; } /* was tired of having no way of moving it around, so - * here's a little 'hook' to do so */ +* here's a little 'hook' to do so */ .delete-checked { - position: absolute; - left: 35px; - margin-top: 20px; + position: absolute; + left: 35px; + margin-top: 20px; } #item-delete-selected-end { - clear: both; + clear: both; } #item-delete-selected-icon, #item-delete-selected-desc { - float: left; - margin-right: 5px; + float: left; + margin-right: 5px; } #item-delete-selected-desc:hover { - text-decoration: underline; + text-decoration: underline; } .fc-state-highlight { background: #eec; @@ -2275,15 +2324,15 @@ div[id$="wrapper"] br { /** - * directory + * directory */ .directory-item { float: left; - /*margin: 50px 50px 0px 0px;*/ - margin: 0 5px 4px 0; - padding: 3px; - width: 180px; - height: 250px; + /*margin: 50px 50px 0px 0px;*/ + margin: 0 5px 4px 0; + padding: 3px; + width: 180px; + height: 250px; position: relative; } @@ -2296,12 +2345,12 @@ div[id$="wrapper"] br { } .group-selected, .nets-selected, .fileas-selected { padding: 3px; - color: #111; + color: #111; background: #f8f8f8; font-weight: bold; } .group-selected:hover, .nets-selected:hover, .fileas-selected:hover { - color: #111; + color: #111; } .groupsideedit { margin-right: 10px; @@ -2332,7 +2381,7 @@ div[id$="wrapper"] br { text-align: center; } #peoplefind-sidebar form { - margin-bottom: 10px; + margin-bottom: 10px; } #sidebar-new-group:hover { /*background: -webkit-gradient( linear, left top, left bottom, color-stop(0.05, #b20202), color-stop(1, #d60808) );*/ @@ -2347,14 +2396,14 @@ div[id$="wrapper"] br { #side-peoplefind-url { background-color: #e5e0cf; color: #666; - border: 1px 666 solid; - margin-right: 3px; - width: 75%; + border: 1px 666 solid; + margin-right: 3px; + width: 75%; } #side-peoplefind-url:hover, #side-peoplefind-url:focus { background-color: #efefef; color: #222; - border: 1px 333 solid; + border: 1px 333 solid; } .nets-ul { list-style-type: none; @@ -2380,7 +2429,7 @@ div[id$="wrapper"] br { /** - * ADMIN + * admin */ #pending-update { float:right; @@ -2395,6 +2444,12 @@ div[id$="wrapper"] br { .admin.link { list-style-position: inside; } +#adminpage { + color: #111; + background: transparent; + margin: 5px; + padding: 10px; +} #adminpage dl { clear:left; margin-bottom: 2px; @@ -2407,16 +2462,15 @@ div[id$="wrapper"] br { font-weight: bold; } #adminpage dd { - margin-left: 250px; + margin-left: 250px; } #adminpage h3 { border-bottom:1px solid #ccc; } #adminpage .submit { - clear:left; + clear:left; } - #adminpage #pluginslist { margin: 0; padding: 0; @@ -2430,10 +2484,9 @@ div[id$="wrapper"] br { clear: left; } #adminpage .toggleplugin { - float:left; - margin-right: 1em; + float:left; + margin-right: 1em; } - #adminpage table { width: 100%; border-bottom: 1px solid #000; @@ -2457,34 +2510,61 @@ div[id$="wrapper"] br { } #adminpage #users a { /* color: #;*/ - text-decoration: underline; + text-decoration: underline; } +#users .name { + color: #eec; +} + /** - * Form fields + * form fields */ .field { - /*margin-bottom: 10px;*/ - /*padding-bottom: 10px;*/ - overflow: auto; + /*margin-bottom: 10px;*/ + /*padding-bottom: 10px;*/ + overflow: auto; width: 100%; } .field label, label { - float: left; - width: 275px; - display: block; - font-size: 1.077em; - margin: 0 10px 0.5em 0; - border: 1px #999 solid; - padding: 5px; - background: #ccc; - vertical-align: middle; - color: #111; -} -.field input, input[type="text"] { - width: 250px; - height: 25px; - border: 1px #999 solid; + width: 38%; + display: inline-block; + font-size: 1.077em; + margin: 0 10px 1em 0; + border: 1px #999 solid; + padding: 5px; + background: #ccc; + color: #111; +} +input, +input[type="text"], +input[type="password"], +input[type="search"] { + width: 250px; + height: 25px; + border: 1px #999 solid; +} +input[type="checkbox"], input[type="radio"] { + border: 1px #999 solid; + margin: 0 0 0 0; + height: 15px; + width: 15px; +} +input[type="submit"], input[type="button"] { + background-color: #555753; + border: 2px outset #444; + border-radius: 5px; + box-shadow: 1px 3px 4px 0 #111; + color: #eeeeec; + cursor: pointer; + font-weight: bold; + width: auto; + text-shadow: 1px 1px #111; + -webkit-border-radius: 5px; + -moz-border-radius: 5px; +} +input[type="submit"]:active, input[type="button"]:active { + box-shadow: 0 0 0 0; } .field textarea { width: 80%; @@ -2507,12 +2587,12 @@ div[id$="wrapper"] br { text-decoration: none; } .field .onoff .on { - background: url("../../../images/onoff.jpg") no-repeat 42px 1px #999; + background: url("../../../images/onoff.jpg") no-repeat 42px 1px #999; color: #111; text-align: left; } .field .onoff .off { - background: url("../../../images/onoff.jpg") no-repeat 2px 1px #ccc; + background: url("../../../images/onoff.jpg") no-repeat 2px 1px #ccc; color: #333; text-align: right; } @@ -2525,34 +2605,34 @@ div[id$="wrapper"] br { /* - * UPDATE + * update */ .popup { - width: 100%; + width: 100%; height: 100%; - top: 0px; + top: 0px; left: 0px; - position: absolute; - display: none; + position: absolute; + display: none; } .popup .background { - background-color: rgba(0,0,0,128); - opacity: 0.5; - width: 100%; + background-color: rgba(0,0,0,128); + opacity: 0.5; + width: 100%; height: 100%; - position: absolute; - top:0px; + position: absolute; + top:0px; left:0px; } .popup .panel { - top: 25%; + top: 25%; left: 25%; width: 50%; height: 50%; - padding: 1em; - position: absolute; - border: 4px solid #000000; - background-color: #FFFFFF; + padding: 1em; + position: absolute; + border: 4px solid #000000; + background-color: #FFFFFF; } #panel { z-index: 100; @@ -2601,32 +2681,32 @@ div[id$="wrapper"] br { * OAuth */ .oauthapp { - height: auto; + height: auto; overflow: auto; - border-bottom: 2px solid #cccccc; - padding-bottom: 1em; - margin-bottom: 1em; + border-bottom: 2px solid #cccccc; + padding-bottom: 1em; + margin-bottom: 1em; } .oauthapp img { - float: left; - width: 48px; height: 48px; - margin: 10px; + float: left; + width: 48px; height: 48px; + margin: 10px; } .oauthapp img.noicon { - background-image: url("../../../images/icons/48/plugin.png"); - background-position: center center; - background-repeat: no-repeat; + background-image: url("../../../images/icons/48/plugin.png"); + background-position: center center; + background-repeat: no-repeat; } .oauthapp a { - float: left; + float: left; } /** - * ICONS + * icons */ .iconspacer { - display: block; + display: block; width: 16px; height: 16px; } @@ -2637,24 +2717,89 @@ div[id$="wrapper"] br { background: url(icons.png) no-repeat; border: 0; text-decoration: none; - border-radius: 5px; + border-radius: 5px; } .icon:hover { border: 0; text-decoration: none; } +.editicon { + display: inline-block; + width: 21px; + height: 21px; + background: url(editicons.png) no-repeat; + border: 0; + text-decoration: none; +} +.shadow { + box-shadow: 2px 2px 5px 2px #111; +} +.shadow:active, .shadow:focus, .shadow:hover { + box-shadow: 0 0 0 0; +} +.editicon:hover { + border: 0; +} +.boldbb { + background-position: 0px 0px; +} +.boldbb:hover { + background-position: -22px 0px; +} +.italicbb { + background-position: 0px -22px; +} +.italicbb:hover { + background-position: -22px -22px; +} +.underlinebb { + background-position: 0px -44px; +} +.underlinebb:hover { + background-position: -22px -44px; +} +.quotebb { + background-position: 0px -66px; +} +.quotebb:hover { + background-position: -22px -66px; +} +.codebb { + background-position: 0px -88px; +} +.codebb:hover { + background-position: -22px -88px; +} +.imagebb { + background-position: -44px 0px; +} +.imagebb:hover { + background-position: -66px 0px; +} +.urlbb { + background-position: -44px -22px; +} +.urlbb:hover { + background-position: -66px -22px; +} +.videobb { + background-position: -44px -44px; +} +.videobb:hover { + background-position: -66px -44px; +} .icon.drop, .icon.drophide, .icon.delete { float: left; - margin: 0 2px; + margin: 0 2px; } .icon.s22.delete { - display: block; - background-position: -110px 0; + display: block; + background-position: -110px 0; } .icon.s22.text { - padding: 10px 0px 0px 25px; - width: 200px; + padding: 10px 0px 0px 25px; + width: 200px; } .icon.text { text-indent: 0px; @@ -2670,118 +2815,118 @@ div[id$="wrapper"] br { margin: 0px 5px; } .article { - background-position: -50px 0; + background-position: -50px 0; } .audio { - background-position: -70px 0; + background-position: -70px 0; } .block { - background-position: -90px 0px; + background-position: -90px 0px; } .drop, .delete { - background-position: -110px 0; + background-position: -110px 0; } .drophide { - background-position: -130px 0; + background-position: -130px 0; } .edit { - background-position: -150px 0; + background-position: -150px 0; } .camera { - background-position: -170px 0; + background-position: -170px 0; } .dislike { - background-position: -190px 0; + background-position: -190px 0; } .file-as { - background-position: -230px -60px; + background-position: -230px -60px; } .like { - background-position: -211px 0; + background-position: -211px 0; } .link { - background-position: -230px 0; + background-position: -230px 0; } .globe, .location { - background-position: -50px -20px; + background-position: -50px -20px; } .noglobe, .nolocation { - background-position: -70px -20px; + background-position: -70px -20px; } .no { - background-position: -90px -20px; + background-position: -90px -20px; } .pause { - background-position: -110px -20px; + background-position: -110px -20px; } .play { - background-position: -130px -20px; + background-position: -130px -20px; } .pencil { - background-position: -151px -18px; + background-position: -151px -18px; } .small-pencil { - background-position: -170px -20px; + background-position: -170px -20px; } .recycle { - background-position: -190px -20px; + background-position: -190px -20px; } .remote-link { - background-position: -210px -20px; + background-position: -210px -20px; } .share { - background-position: -230px -20px; + background-position: -230px -20px; } .tools { - background-position: -50px -40px; + background-position: -50px -40px; } .lock { - background-position: -70px -40px; + background-position: -70px -40px; } .unlock { - background-position: -88px -40px; + background-position: -88px -40px; } .video { - background-position: -110px -40px; + background-position: -110px -40px; } .attach { - background-position: -190px -40px; + background-position: -190px -40px; } .language { - background-position: -210px -40px; + background-position: -210px -40px; } .starred { - background-position: -130px -60px; + background-position: -130px -60px; } .unstarred { - background-position: -150px -60px; + background-position: -150px -60px; } .tagged { - background-position: -170px -60px; + background-position: -170px -60px; } .on { - background-position: -50px -60px; + background-position: -50px -60px; } .off { - background-position: -70px -60px; + background-position: -70px -60px; } .prev { - background-position: -90px -60px; + background-position: -90px -60px; } .next { - background-position: -110px -60px; + background-position: -110px -60px; } .icon.dim { - opacity: 0.3; - filter: alpha(opacity=30); + opacity: 0.3; + filter: alpha(opacity=30); } #pause { - position: fixed; - bottom: 5px; - right: 5px; + position: fixed; + bottom: 40px; + right: 30px; } .border, .border:hover { - border: 1px solid #babdb6; + border: 1px solid #babdb6; -webkit-border-radius: 5px; -moz-border-radius: 5px; border-radius: 5px; @@ -2810,7 +2955,7 @@ div[id$="wrapper"] br { /** - * footer + * footer */ .cc-license { margin-top: 100px; @@ -2818,7 +2963,7 @@ div[id$="wrapper"] br { } footer { display: block; - /*margin: 50px 20%;*/ + /*margin: 50px 20%;*/ clear: both; } #profile-jot-text { @@ -2830,24 +2975,26 @@ footer { } -/** acl **/ +/** + * acl + */ #photo-edit-perms-select, #photos-upload-permissions-wrapper, #profile-jot-acl-wrapper { display: block !important; - background: #eec; - color: #2e2f2e; + background: #eec; + color: #2e2f2e; } #acl-wrapper { width: 660px; - margin: 0 auto; + margin: 0 auto; } #acl-search { float: right; background: #fff url("../../../images/search_18.png") no-repeat right center; padding-right: 20px; - margin: 6px; - color: #111; + margin: 6px; + color: #111; } #acl-showall { float: left; @@ -2860,7 +3007,7 @@ footer { -moz-border-radius: 5px; border-radius: 5px; color: #999; - margin: 5px 0; + margin: 5px 0; } #acl-showall.selected { color: #000; @@ -2876,7 +3023,7 @@ footer { /*#acl-list-content { }*/ .acl-list-item { - border: 1px solid #ccc; + border: 1px solid #ccc; display: block; float: left; height: 110px; @@ -2900,29 +3047,29 @@ footer { -webkit-border-radius: 2px; -moz-border-radius: 2px; border-radius: 2px; - clear: both; + clear: both; font-size: 10px; display: block; width: 55px; height: 20px; color: #999; margin: 5px auto 0; - padding: 0 3px; - text-align: center; - vertical-align: middle; + padding: 0 3px; + text-align: center; + vertical-align: middle; } #acl-wrapper a:hover { text-decoration: none; color: #000; - border: 0; + border: 0; } .acl-button-show { background-image: url('../../../images/show_off.png'); - margin: 0 auto; + margin: 0 auto; } .acl-button-hide { background-image: url('../../../images/hide_off.png'); - margin: 0 auto; + margin: 0 auto; } .acl-button-show.selected { color: #000; @@ -2945,25 +3092,25 @@ footer { /* autocomplete popup */ .acpopup { - max-height: 175px; + max-height: 175px; max-width: 42%; - background-color: #555753; - color: #fff; - overflow: auto; - z-index: 100000; - border: 1px solid #cccccc; + background-color: #555753; + color: #fff; + overflow: auto; + z-index: 100000; + border: 1px solid #cccccc; } .acpopupitem { - background-color: #555753; + background-color: #555753; padding: 4px; - clear: left; + clear: left; } .acpopupitem img { - float: left; - margin-right: 4px; + float: left; + margin-right: 4px; } .acpopupitem.selected { - color: #2e3436; + color: #2e3436; background-color: #eeeeec; } .qcomment-wrapper { @@ -2971,12 +3118,12 @@ footer { margin: 5px 5px 5px 81%; } .qcomment { - opacity: 0.5; - filter:alpha(opacity=50); + opacity: 0.5; + filter:alpha(opacity=50); } .qcomment:hover { - opacity: 1.0; - filter:alpha(opacity=100); + opacity: 1.0; + filter:alpha(opacity=100); } #network-star-link { margin-top: 10px; @@ -2989,32 +3136,38 @@ footer { display: inline-block; } #fileas-sidebar { - + } .fileas-ul { - padding: 0; + padding: 0; } /* - * ADDONS THEMING + * addons theming */ #sidebar-page-list { - + } #sidebar-page-list ul { - padding: 0; - margin: 5px 0; + padding: 0; + margin: 5px 0; } #sidebar-page-list li { - list-style: none; + list-style: none; +} +#jappix_mini { + margin-left: 130px; + position: fixed; + bottom: 0; + right: 175px !important; /* override the jappix css */ + z-index: 999; } - @media handheld { - body { - font-size: 15pt; - } + body { + font-size: 15pt; + } } diff --git a/view/theme/dispy/theme.php b/view/theme/dispy/theme.php index 8af61d78b..b72de51e5 100644 --- a/view/theme/dispy/theme.php +++ b/view/theme/dispy/theme.php @@ -76,7 +76,7 @@ function dispy_init(&$a) { // click outside notifications menu closes it $('html').click(function() { $('#nav-notifications-linkmenu').removeClass('selected'); - document.getElementById("nav-notifications-menu").style.display = "none"; + $('#nav-notifications-menu').css({display: 'none'}); }); $('#nav-notifications-linkmenu').click(function(event) { @@ -85,7 +85,7 @@ function dispy_init(&$a) { // click outside profiles menu closes it $('html').click(function() { $('#profiles-menu-trigger').removeClass('selected'); - document.getElementById("profiles-menu").style.display = "none"; + $('#profiles-menu').css({display: 'none'}); }); $('#profiles-menu').click(function(event) { @@ -120,7 +120,7 @@ function dispy_init(&$a) { }); $('a[href=#top]').click(function() { - $('html, body').animate({scrollTop:0}, '500'); + $('html, body').animate({scrollTop:0}, 'slow'); return false; }); @@ -138,6 +138,8 @@ function dispy_init(&$a) { }); </script> EOT; + + js_in_foot(); } function dispy_community_info() { @@ -145,26 +147,17 @@ function dispy_community_info() { $url = $a->get_baseurl($ssl_state); $aside['$url'] = $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)); - a_funct = function() { - if (!window.open(the_url, 'fpostit', 'location=yes,links=no,scrollbars=no,toolbar=no,width=600,height=300')) { - location.href = the_url; - } - if (/Firefox/.test(navigator.userAgent)) { - setTimeout(a_funct, 0) - } else { - a_funct(); - } - })(); -FPI; - - $aside['$fpostitJS'] = $fpostitJS; $tpl = file_get_contents(dirname(__file__) . '/communityhome.tpl'); return $a->page['aside_bottom'] = replace_macros($tpl, $aside); } +function js_in_foot() { + /** @purpose insert stuff in bottom of page + */ + $a = get_app(); + $baseurl = $a->get_baseurl($ssl_state); + $bottom['$baseurl'] = $baseurl; + $tpl = file_get_contents(dirname(__file__) . '/bottom.tpl'); + + return $a->page['bottom'] = replace_macros($tpl, $bottom); +} |
