modified: view/theme/smoothly/comment_item.tpl

	new file:   view/theme/smoothly/dot.png
	new file:   view/theme/smoothly/moderated_comment.tpl
	modified:   view/theme/smoothly/style.css
	modified:   view/theme/smoothly/theme.php
	deleted:    view/theme/smoothly/icons/dot.png
	deleted:    view/theme/smoothly/js/jquery.ae.image.resize.js
	deleted:    view/theme/smoothly/js/jquery.ae.image.resize.min.js

diff --git a/view/theme/smoothly/comment_item.tpl b/view/theme/smoothly/comment_item.tpl
old mode 100644 (file)
new mode 100755 (executable)
index 2e9dc51..f64ae75
--- a/view/theme/smoothly/comment_item.tpl
+++ b/view/theme/smoothly/comment_item.tpl
@@ -1,31 +1,66 @@
-<div class="comment-wwedit-wrapper" id="comment-edit-wrapper-$id" style="display: block;">
-       <form class="comment-edit-form" id="comment-edit-form-$id" action="item" method="post" onsubmit="post_comment($id); return false;">
-               <input type="hidden" name="type" value="$type" />
-               <input type="hidden" name="profile_uid" value="$profile_uid" />
-               <input type="hidden" name="parent" value="$parent" />
-               <input type="hidden" name="return" value="$return_path" />
-               <input type="hidden" name="jsreload" value="$jsreload" />
-               <input type="hidden" name="preview" id="comment-preview-inp-$id" value="0" />
+               <div class="comment-wwedit-wrapper" id="comment-edit-wrapper-$id" style="display: block;">
+                       {{ if $threaded }}
+                       <span id="hide-commentbox-$id" class="hide-commentbox fakelink" onclick="showHideCommentBox($id);">$comment</span>
+                       <form class="comment-edit-form" style="display: none;" id="comment-edit-form-$id" action="item" method="post" onsubmit="post_comment($id); return false;">
+                       {{ else }}
+                       <form class="comment-edit-form" style="display: block;" id="comment-edit-form-$id" action="item" method="post" onsubmit="post_comment($id); return false;">
+                       {{ endif }}
+                               <input type="hidden" name="type" value="$type" />
+                               <input type="hidden" name="profile_uid" value="$profile_uid" />
+                               <input type="hidden" name="parent" value="$parent" />
+                               <input type="hidden" name="return" value="$return_path" />
+                               <input type="hidden" name="jsreload" value="$jsreload" />
+                               <input type="hidden" name="preview" id="comment-preview-inp-$id" value="0" />
 
-               <div class="comment-edit-photo" id="comment-edit-photo-$id" >
-                       <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>
-               {{ if $qcomment }}
-               {{ for $qcomment as $qc }}
-                       <span class="fakelink qcomment" onclick="commentInsert(this,$id); return false;" >$qc</span>
-                       &nbsp;
-               {{ endfor }}
-               {{ endif }}
+                               <div class="comment-edit-photo" id="comment-edit-photo-$id" >
+                                       <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>
+                               <ul class="comment-edit-bb-$id">
+                                       <li><a class="editicon boldbb shadow"
+                                               style="cursor: pointer;" title="$edbold"
+                                               onclick="insertFormatting('$comment','b', $id);"></a></li>
+                                       <li><a class="editicon italicbb shadow"
+                                               style="cursor: pointer;" title="$editalic"
+                                               onclick="insertFormatting('$comment','i', $id);"></a></li>
+                                       <li><a class="editicon underlinebb shadow"
+                                               style="cursor: pointer;" title="$eduline"
+                                               onclick="insertFormatting('$comment','u', $id);"></a></li>
+                                       <li><a class="editicon quotebb shadow"
+                                               style="cursor: pointer;" title="$edquote"
+                                               onclick="insertFormatting('$comment','quote', $id);"></a></li>
+                                       <li><a class="editicon codebb shadow"
+                                               style="cursor: pointer;" title="$edcode"
+                                               onclick="insertFormatting('$comment','code', $id);"></a></li>
+                                       <li><a class="editicon imagebb shadow"
+                                               style="cursor: pointer;" title="$edimg"
+                                               onclick="insertFormatting('$comment','img', $id);"></a></li>
+                                       <li><a class="editicon urlbb shadow"
+                                               style="cursor: pointer;" title="$edurl"
+                                               onclick="insertFormatting('$comment','url', $id);"></a></li>
+                                       <li><a class="editicon videobb shadow"
+                                               style="cursor: pointer;" title="$edvideo"
+                                               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);cmtBbOpen($id);" onBlur="commentClose(this,$id);" >$comment</textarea>                  
+                               {{ if $qcomment }}
+                                       <select id="qcomment-select-$id" name="qcomment-$id" class="qcomment" onchange="qCommentInsert(this,$id);" >
+                                       <option value=""></option>
+                               {{ for $qcomment as $qc }}
+                                       <option value="$qc">$qc</option>                                
+                               {{ endfor }}
+                                       </select>
+                               {{ endif }}
 
-               <div class="comment-edit-text-end"></div>
-               <div class="comment-edit-submit-wrapper" id="comment-edit-submit-wrapper-$id" style="display: none;" >
-                       <input type="submit" onclick="post_comment($id); return false;" id="comment-edit-submit-$id" class="comment-edit-submit" name="submit" value="$submit" />
-                       <span onclick="preview_comment($id);" id="comment-edit-preview-link-$id" class="fakelink">$preview</span>
-               </div>
+                               <div class="comment-edit-text-end"></div>
+                               <div class="comment-edit-submit-wrapper" id="comment-edit-submit-wrapper-$id" style="display: none;" >
+                                       <input type="submit" onclick="post_comment($id); return false;" id="comment-edit-submit-$id" class="comment-edit-submit" name="submit" value="$submit" />
+                                       <span onclick="preview_comment($id);" id="comment-edit-preview-link-$id" class="fakelink">$preview</span>
+                                       <div id="comment-edit-preview-$id" class="comment-edit-preview" style="display:none;"></div>
+                               </div>
 
-               <div class="comment-edit-end"></div>
-       </form>
-       </div>
-<div id="comment-edit-preview-$id" class="comment-edit-preview" style="display:none;"></div>
+                               <div class="comment-edit-end"></div>
+                       </form>
+
+               </div>

diff --git a/view/theme/smoothly/dot.png b/view/theme/smoothly/dot.png
new file mode 100644 (file)
index 0000000..6f53251
Binary files /dev/null and b/view/theme/smoothly/dot.png differ

diff --git a/view/theme/smoothly/moderated_comment.tpl b/view/theme/smoothly/moderated_comment.tpl
new file mode 100755 (executable)
index 0000000..b0451c8
--- /dev/null
+++ b/view/theme/smoothly/moderated_comment.tpl
@@ -0,0 +1,61 @@
+               <div class="comment-wwedit-wrapper" id="comment-edit-wrapper-$id" style="display: block;">
+                       <form class="comment-edit-form" id="comment-edit-form-$id" action="item" method="post" onsubmit="post_comment($id); return false;">
+                               <input type="hidden" name="type" value="$type" />
+                               <input type="hidden" name="profile_uid" value="$profile_uid" />
+                               <input type="hidden" name="parent" value="$parent" />
+                               <input type="hidden" name="return" value="$return_path" />
+                               <input type="hidden" name="jsreload" value="$jsreload" />
+                               <input type="hidden" name="preview" id="comment-preview-inp-$id" value="0" />
+
+                               <div class="comment-edit-photo" id="comment-edit-photo-$id" >
+                                       <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>
+                               <div id="mod-cmnt-wrap-$id" class="mod-cmnt-wrap" style="display:none">
+                                       <div id="mod-cmnt-name-lbl-$id" class="mod-cmnt-name-lbl">$lbl_modname</div>
+                                       <input type="text" id="mod-cmnt-name-$id" class="mod-cmnt-name" name="mod-cmnt-name" value="$modname" />
+                                       <div id="mod-cmnt-email-lbl-$id" class="mod-cmnt-email-lbl">$lbl_modemail</div>
+                                       <input type="text" id="mod-cmnt-email-$id" class="mod-cmnt-email" name="mod-cmnt-email" value="$modemail" />
+                                       <div id="mod-cmnt-url-lbl-$id" class="mod-cmnt-url-lbl">$lbl_modurl</div>
+                                       <input type="text" id="mod-cmnt-url-$id" class="mod-cmnt-url" name="mod-cmnt-url" value="$modurl" />
+                               </div>
+                               <ul class="comment-edit-bb-$id">
+                                       <li><a class="editicon boldbb shadow"
+                                               style="cursor: pointer;" title="$edbold"
+                                               onclick="insertFormatting('$comment','b', $id);"></a></li>
+                                       <li><a class="editicon italicbb shadow"
+                                               style="cursor: pointer;" title="$editalic"
+                                               onclick="insertFormatting('$comment','i', $id);"></a></li>
+                                       <li><a class="editicon underlinebb shadow"
+                                               style="cursor: pointer;" title="$eduline"
+                                               onclick="insertFormatting('$comment','u', $id);"></a></li>
+                                       <li><a class="editicon quotebb shadow"
+                                               style="cursor: pointer;" title="$edquote"
+                                               onclick="insertFormatting('$comment','quote', $id);"></a></li>
+                                       <li><a class="editicon codebb shadow"
+                                               style="cursor: pointer;" title="$edcode"
+                                               onclick="insertFormatting('$comment','code', $id);"></a></li>
+                                       <li><a class="editicon imagebb shadow"
+                                               style="cursor: pointer;" title="$edimg"
+                                               onclick="insertFormatting('$comment','img', $id);"></a></li>
+                                       <li><a class="editicon urlbb shadow"
+                                               style="cursor: pointer;" title="$edurl"
+                                               onclick="insertFormatting('$comment','url', $id);"></a></li>
+                                       <li><a class="editicon videobb shadow"
+                                               style="cursor: pointer;" title="$edvideo"
+                                               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);cmtBbOpen($id);" onBlur="commentClose(this,$id);" >$comment</textarea>                  
+
+                               <div class="comment-edit-text-end"></div>
+                               <div class="comment-edit-submit-wrapper" id="comment-edit-submit-wrapper-$id" style="display: none;" >
+                                       <input type="submit" onclick="post_comment($id); return false;" id="comment-edit-submit-$id" class="comment-edit-submit" name="submit" value="$submit" />
+                                       <span onclick="preview_comment($id);" id="comment-edit-preview-link-$id" class="fakelink">$preview</span>
+                                       <div id="comment-edit-preview-$id" class="comment-edit-preview" style="display:none;"></div>
+                               </div>
+
+                               <div class="comment-edit-end"></div>
+                       </form>
+
+               </div>

diff --git a/view/theme/smoothly/style.css b/view/theme/smoothly/style.css
index d1f50b04d5ea97ea8f2649482a3800c0ea0fd55d..9667eaf1d0a90de464caa3a8c62dbdb4edb97f6e 100644 (file)
--- a/view/theme/smoothly/style.css
+++ b/view/theme/smoothly/style.css
@@ -3314,7 +3314,7 @@ ul.menu-popup {
 }
 
 hr.line-dots {
-    background: url("icons/dot.png") repeat-x scroll left center transparent;
+    background: url("dot.png") repeat-x scroll left center transparent;
     border: medium none;
     /*padding: 0.5em 0;*/
 }

diff --git a/view/theme/smoothly/theme.php b/view/theme/smoothly/theme.php
index 95cc9bd73c2ede9a85aa25626d654c66a6bd2eee..e69b8a3b9926f7a6ac16219a387098ef65e2a65e 100644 (file)
--- a/view/theme/smoothly/theme.php
+++ b/view/theme/smoothly/theme.php
@@ -6,16 +6,14 @@
  * Version: 0.4
  * Author: Alex <https://friendica.pixelbits.de/profile/alex>
  * Maintainer: Alex <https://friendica.pixelbits.de/profile/alex>
- * Screenshot: <a href="screenshot.jpg">Screenshot</a>
+ * Screenshot: <a href="screenshot.png">Screenshot</a>
  */
 
-$a->theme_info = array(
-  'extends' => 'smoothly',
-);
+$a->theme_info = array();
+
 function smoothly_init(&$a) {
 $a->page['htmlhead'] .= <<< EOT
 <script>
-
 function insertFormatting(comment,BBcode,id) {
        
                var tmpStr = $("#comment-edit-text-" + id).val();
@@ -52,9 +50,10 @@ function cmtBbOpen(id) {
 function cmtBbClose(comment, id) {
        $(".comment-edit-bb-" + id).hide();
 }
-
 $(document).ready(function() {
 
+$('html').click(function() { $("#nav-notifications-menu" ).hide(); });
+
 $('.group-edit-icon').hover(
        function() {
                $(this).addClass('icon'); $(this).removeClass('iconspacer');},
@@ -95,25 +94,4 @@ $('.savedsearchterm').hover(
 
 </script>
 EOT;
-// get resize configuration
-
-$resize=false;
-$site_resize = get_config('smoothly', 'resize' );
-if(local_user()) $resize = get_pconfig(local_user(), 'smoothly', 'resize' );
-
-if ($resize===false) $resize=$site_resize;
-if ($resize===false) $resize=0;
-
-if (intval($resize) > 0) {
-//load jquery.ae.image.resize.js
-$imageresizeJS = $a->get_baseurl($ssl_state)."/view/theme/smoothly/js/jquery.ae.image.resize.js";
-$a->page['htmlhead'] .= sprintf('<script language="JavaScript" src="%s" ></script>', $imageresizeJS);
-$a->page['htmlhead'] .= '
-<script>
-
- $(function() {
-       $(".wall-item-content  img").aeImageResize({height: '.$resize.', width: '.$resize.'});
-  });
-</script>';}
 }
-