Frost: reduce DOM elements by about 20%; other tweaks and fixes

diff --git a/view/theme/frost-mobile/TODO b/view/theme/frost-mobile/TODO
index 691154c3cb5736670fde27d961d4b4eba6c69bd0..cc35b63050057d996079a5e8e1849cdda05eb6a1 100644 (file)
--- a/view/theme/frost-mobile/TODO
+++ b/view/theme/frost-mobile/TODO
@@ -14,8 +14,10 @@ Photo album display?
 
 - Admin: access to more pages than summary?
 
+- Embedded video playback is way too big
+
 - Needs to be faster!
-       - Reduce DOM elements (4100 for 10 items)
+       - Reduce DOM elements (~2400 for 10 items, ~8400 for 40 items)
        - Automatically set limit of 10 items for Network and Profile?
 
 

diff --git a/view/theme/frost-mobile/comment_item.tpl b/view/theme/frost-mobile/comment_item.tpl
index 8fb578369503f94de85f0f02de2593cfd246be72..b5b0e9d289954f34b0fba8a04b1fa1729ef57b12 100755 (executable)
--- a/view/theme/frost-mobile/comment_item.tpl
+++ b/view/theme/frost-mobile/comment_item.tpl
@@ -19,10 +19,10 @@
                                <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 class="comment-edit-photo" id="comment-edit-photo-$id" >-->
+                                       <a class="comment-edit-photo comment-edit-photo-link" id="comment-edit-photo-$id" 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"
@@ -49,7 +49,7 @@
                                                style="cursor: pointer;" title="$edvideo"
                                                onclick="insertFormatting('$comment','video', $id);"></a></li>-->
                                </ul>   
-                               <div class="comment-edit-bb-end"></div>
+                               <!--<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);cmtBbClose($id);" >$comment</textarea>-->
                                <textarea id="comment-edit-text-$id" class="comment-edit-text-empty" name="body" onFocus="commentOpen(this,$id);cmtBbOpen($id);" >$comment</textarea>
                                {{ if $qcomment }}
@@ -68,7 +68,7 @@
                                        <div id="comment-edit-preview-$id" class="comment-edit-preview" style="display:none;"></div>-->
                                </div>
 
-                               <div class="comment-edit-end"></div>
+                               <!--<div class="comment-edit-end"></div>-->
                        </form>
 
                </div>

diff --git a/view/theme/frost-mobile/nav.tpl b/view/theme/frost-mobile/nav.tpl
index bc12409e2c868bb30b57b859bda2377c160755b4..54f7b54ca5735d16cf84a83d12ae12d9d9243ac0 100644 (file)
--- a/view/theme/frost-mobile/nav.tpl
+++ b/view/theme/frost-mobile/nav.tpl
@@ -3,8 +3,6 @@
 
 <!--   <div id="site-location">$sitelocation</div> -->
 
-       {{ 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> {{ endif }}
-
        <span id="nav-link-wrapper" >
 
 <!--   <a id="system-menu-link" class="nav-link" href="#system-menu" title="Menu">Menu</a>-->
@@ -13,11 +11,20 @@
        <img rel="#system-menu-list" class="nav-link" src="/view/theme/frost-mobile/images/menu.png">
 <!--   </a>-->
        <ul id="system-menu-list" class="nav-menu-list">
-                       {{ if $nav.manage }}
-                       <li>
-                       <a id="nav-manage-link" class="nav-link $nav.manage.2 $sel.manage" href="$nav.manage.0" title="$nav.manage.3">$nav.manage.1</a>
-                       </li>
-                       {{ endif }}
+               {{ if $nav.login }}
+               <a id="nav-login-link" class="nav-load-page-link $nav.login.2" href="$nav.login.0" title="$nav.login.3" >$nav.login.1</a>
+               {{ endif }}
+
+               {{ if $nav.register }}
+               <a id="nav-register-link" class="nav-load-page-link $nav.register.2 $sel.register" href="$nav.register.0" title="$nav.register.3" >$nav.register.1</a>
+               {{ endif }}
+
+               {{ if $nav.manage }}
+               <li>
+               <a id="nav-manage-link" class="nav-load-page-link $nav.manage.2 $sel.manage" href="$nav.manage.0" title="$nav.manage.3">$nav.manage.1</a>
+               </li>
+               {{ endif }}
+
                {{ if $nav.settings }}
                <li><a id="nav-settings-link" class="$nav.settings.2 nav-load-page-link" href="$nav.settings.0" title="$nav.settings.3">$nav.settings.1</a></li>
                {{ endif }}
@@ -123,10 +130,8 @@
        </ul>
        </div>
 
-       {{ if $nav.register }}<a id="nav-register-link" class="nav-commlink $nav.register.2 $sel.register" href="$nav.register.0" title="$nav.register.3" >$nav.register.1</a>{{ endif }}
-               
        </span>
-       <span id="nav-end"></span>
+       <!--<span id="nav-end"></span>-->
        <span id="banner">$banner</span>
 </nav>
 

diff --git a/view/theme/frost-mobile/style.css b/view/theme/frost-mobile/style.css
index ec260de79df6f7abbb2f0853ac41e20edbbf1348..88273a703524e53421c0ca65ac66a0d8912776af 100644 (file)
--- a/view/theme/frost-mobile/style.css
+++ b/view/theme/frost-mobile/style.css
@@ -1185,7 +1185,7 @@ input#dfrn-url {
        display: none;
        z-index: 10000;
 }
-.wall-item-photo-menu ul { margin:0px; padding: 0px; list-style: none }
+.wall-item-photo-menu { margin:0px; padding: 0px; list-style: none }
 .wall-item-photo-menu li a { display: block; padding: 2px; }
 .wall-item-photo-menu li a:hover { color: #FFFFFF; background: #3465A4; text-decoration: none; }
 
@@ -1205,7 +1205,7 @@ input#dfrn-url {
        height: 30px !important;
 }
 
-.wallwall .wall-item-photo-end {
+.wallwall /*.wall-item-photo-end*/ {
        clear: both;
 }
 
@@ -1247,7 +1247,7 @@ input#dfrn-url {
 
 .wall-item-like-buttons {
        float: left;
-       margin-right: 10px;
+       margin-right: 3px;
 }
 
 .like-rotator {
@@ -1294,18 +1294,18 @@ input#dfrn-url {
        float: right;
 }
 
-.wall-item-delete-end {
+/*.wall-item-delete-end {
        clear: both;
-}
+}*/
 
 .wall-item-delete-icon {
        border: none;
 }
 
 
-.wall-item-wrapper-end {
+/*.wall-item-wrapper-end {
        clear: both;
-}
+}*/
 .wall-item-name-link {
        font-weight: bold;
        text-decoration: none;
@@ -1343,9 +1343,9 @@ input#dfrn-url {
        /*width: 450px;*/
 }
 
-.wall-item-title-end {
+/*.wall-item-title-end {
        clear: both;
-}
+}*/
 
 .wall-item-body {
        text-align: justify;
@@ -1370,7 +1370,7 @@ input#dfrn-url {
 /*     background-image: url("head.jpg");
        background-position: 0 -20px;
        background-repeat: repeat-x;*/
-       padding: 5px 10px 0px;
+       padding: 5px 5px 0px;
        height: 32px;
 }
 .wall-item-author {
@@ -1394,6 +1394,7 @@ input#dfrn-url {
 }
 
 .comment-wwedit-wrapper {
+       display: block;
        margin-top: 15px;
        background: #f3f3f3;
        margin-left: 10px;
@@ -3571,7 +3572,8 @@ aside input[type='text'] {
        background-image: url('images/unlock.png');
        background-repeat: no-repeat;
 }
-.video { display: none; background-position: -48px -32px;}
+.icon.video { display: none; background-position: -48px -32px;}
+.oembed.video a { display: block; }
 .youtube { background-position: -64px -32px;}
 /*.attach { background-position: -80px -32px; }*/
 .icon.attach {

diff --git a/view/theme/frost-mobile/wall_item.tpl b/view/theme/frost-mobile/wall_item.tpl
index 65e2812f9aa1d8bc385e5ab293a2fd181a5b84d3..d7b75f54d8446d43aa90ad61f0bbe027f8b0e088 100644 (file)
--- a/view/theme/frost-mobile/wall_item.tpl
+++ b/view/theme/frost-mobile/wall_item.tpl
@@ -1,5 +1,5 @@
 <a name="$item.id" ></a>
-<div class="wall-item-outside-wrapper$item.indent$item.previewing" id="wall-item-outside-wrapper-$item.id" >
+<!--<div class="wall-item-outside-wrapper$item.indent$item.previewing" id="wall-item-outside-wrapper-$item.id" >-->
        <div class="wall-item-content-wrapper$item.indent" id="wall-item-content-wrapper-$item.id" >
                <div class="wall-item-info" id="wall-item-info-$item.id">
 <!--                   <div class="wall-item-photo-wrapper" id="wall-item-photo-wrapper-$item.id" 
@@ -16,29 +16,29 @@
                                        </ul>
                                </div>-->
                        </div>
-                       <div class="wall-item-photo-end"></div>
+                       <!--<div class="wall-item-photo-end"></div>-->
                        <div class="wall-item-wrapper" id="wall-item-wrapper-$item.id" >
-                               {{ if $item.lock }}<div class="wall-item-lock"><img src="images/lock_icon.gif" class="lockview" alt="$item.lock" onclick="lockview(event,$item.id);" /></div>
+                               {{ if $item.lock }}<!--<div class="wall-item-lock">--><img src="images/lock_icon.gif" class="wall-item-lock lockview" alt="$item.lock" onclick="lockview(event,$item.id);" /><!--</div>-->
                                {{ else }}<div class="wall-item-lock"></div>{{ endif }} 
                                <div class="wall-item-location" id="wall-item-location-$item.id">$item.location</div>                           
                        </div>
                </div>
-               <div class="wall-item-author">
+               <!--<div class="wall-item-author">-->
                                <a href="$item.profile_url" target="redir" title="$item.linktitle" class="wall-item-name-link"><span class="wall-item-name$item.sparkle" id="wall-item-name-$item.id" >$item.name</span></a>
                                <div class="wall-item-ago"  id="wall-item-ago-$item.id">$item.ago</div>
                                
-               </div>
+               <!--</div>-->
                <br />
 
                <div class="wall-item-content" id="wall-item-content-$item.id" >
                        <div class="wall-item-title" id="wall-item-title-$item.id">$item.title</div>
-                       <div class="wall-item-title-end"></div>
+                       <!--<div class="wall-item-title-end"></div>-->
                        <div class="wall-item-body" id="wall-item-body-$item.id" >$item.body
-                                       <div class="body-tag">
+                                       <!--<div class="body-tag">-->
                                                {{ for $item.tags as $tag }}
-                                                       <span class='tag'>$tag</span>
+                                                       <span class='body-tag tag'>$tag</span>
                                                {{ endfor }}
-                                       </div>
+                                       <!--</div>-->
                        </div>
                </div>
                <div class="wall-item-tools" id="wall-item-tools-$item.id">
@@ -51,7 +51,7 @@
                        </div>
                        {{ endif }}
                        {{ if $item.plink }}
-                               <div class="wall-item-links-wrapper"><a href="$item.plink.href" title="$item.plink.title" target="external-link" class="icon remote-link$item.sparkle"></a></div>
+                               <!--<div class="wall-item-links-wrapper">--><a href="$item.plink.href" title="$item.plink.title" target="external-link" class="wall-item-links-wrapper icon remote-link$item.sparkle"></a><!--</div>-->
                        {{ endif }}
                        {{ if $item.edpost }}
                                <a class="editpost icon pencil" href="$item.edpost.0" title="$item.edpost.1"></a>
@@ -64,19 +64,19 @@
                        {{ if $item.filer }}
                        <a href="#" id="filer-$item.id" onclick="itemFiler($item.id); return false;" class="filer-item filer-icon" title="$item.filer"></a>
                        {{ endif }}                     
-                       <div class="wall-item-delete-wrapper" id="wall-item-delete-wrapper-$item.id" >
-                               {{ if $item.drop.dropping }}<a href="item/drop/$item.id" onclick="return confirmDelete();" class="icon drophide" title="$item.drop.delete" onmouseover="imgbright(this);" onmouseout="imgdull(this);" ></a>{{ endif }}
-                       </div>
+                       <!--<div class="wall-item-delete-wrapper" id="wall-item-delete-wrapper-$item.id" >-->
+                               {{ if $item.drop.dropping }}<a href="item/drop/$item.id" onclick="return confirmDelete();" class="wall-item-delete-wrapper icon drophide" id="wall-item-delete-wrapper-$item.id" title="$item.drop.delete" onmouseover="imgbright(this);" onmouseout="imgdull(this);" ></a>{{ endif }}
+                       <!--</div>-->
                                {{ if $item.drop.dropping }}<input type="checkbox" onclick="checkboxhighlight(this);" title="$item.drop.select" class="item-select" name="itemselected[]" value="$item.id" />{{ endif }}
-                       <div class="wall-item-delete-end"></div>
+                       <!--<div class="wall-item-delete-end"></div>-->
                </div>
        </div>
-       <div class="wall-item-wrapper-end"></div>
+       <!--<div class="wall-item-wrapper-end"></div>-->
        <div class="wall-item-like $item.indent" id="wall-item-like-$item.id">$item.like</div>
        <div class="wall-item-dislike $item.indent" id="wall-item-dislike-$item.id">$item.dislike</div>
-       <div class="wall-item-comment-wrapper" >
+       <!--<div class="wall-item-comment-wrapper" >-->
        $item.comment
-       </div>
+       <!--</div>-->
 
-<div class="wall-item-outside-wrapper-end$item.indent" ></div>
-</div>
+<!--<div class="wall-item-outside-wrapper-end$item.indent" ></div>-->
+<!--</div>-->

diff --git a/view/theme/frost-mobile/wallwall_item.tpl b/view/theme/frost-mobile/wallwall_item.tpl
new file mode 100644 (file)
index 0000000..562868c
--- /dev/null
+++ b/view/theme/frost-mobile/wallwall_item.tpl
@@ -0,0 +1,87 @@
+<a name="$item.id" ></a>
+<!--<div class="wall-item-outside-wrapper$item.indent$item.previewing wallwall" id="wall-item-outside-wrapper-$item.id" >-->
+       <div class="wall-item-content-wrapper$item.indent" id="wall-item-content-wrapper-$item.id" >
+               <div class="wall-item-info wallwall" id="wall-item-info-$item.id">
+                       <div class="wall-item-photo-wrapper wwto" id="wall-item-ownerphoto-wrapper-$item.id" >
+                               <a href="$item.owner_url" target="redir" title="$item.olinktitle" class="wall-item-photo-link" id="wall-item-ownerphoto-link-$item.id">
+                               <img src="$item.owner_photo" class="wall-item-photo$item.osparkle" id="wall-item-ownerphoto-$item.id" style="height: 80px; width: 80px;" alt="$item.owner_name" /></a>
+                       </div>
+                       <div class="wall-item-arrowphoto-wrapper" ><img src="images/larrow.gif" alt="$item.wall" /></div>
+<!--                   <div class="wall-item-photo-wrapper wwfrom" id="wall-item-photo-wrapper-$item.id" 
+                               onmouseover="if (typeof t$item.id != 'undefined') clearTimeout(t$item.id); openMenu('wall-item-photo-menu-button-$item.id')"
+                onmouseout="t$item.id=setTimeout('closeMenu(\'wall-item-photo-menu-button-$item.id\'); closeMenu(\'wall-item-photo-menu-$item.id\');',200)">-->
+                       <div class="wall-item-photo-wrapper wwfrom" id="wall-item-photo-wrapper-$item.id">
+                               <a href="$item.profile_url" target="redir" title="$item.linktitle" class="wall-item-photo-link" id="wall-item-photo-link-$item.id">
+                               <img src="$item.thumb" class="wall-item-photo$item.sparkle" id="wall-item-photo-$item.id" style="height: 80px; width: 80px;" alt="$item.name" /></a>
+                               <!--<span onclick="openClose('wall-item-photo-menu-$item.id');" class="fakelink wall-item-photo-menu-button" id="wall-item-photo-menu-button-$item.id">menu</span>
+                <div class="wall-item-photo-menu" id="wall-item-photo-menu-$item.id">
+                    <ul class="wall-item-photo-menu" id="wall-item-photo-menu-$item.id">
+                        $item.item_photo_menu
+                    </ul>
+<!--                </div>-->
+
+                       </div>
+                       <!--<div class="wall-item-photo-end"></div>-->
+                       <div class="wall-item-wrapper" id="wall-item-wrapper-$item.id" >
+                               {{ if $item.lock }}<div class="wall-item-lock"><img src="images/lock_icon.gif" class="lockview" alt="$item.lock" onclick="lockview(event,$item.id);" /></div>
+                               {{ else }}<div class="wall-item-lock"></div>{{ endif }} 
+                               <div class="wall-item-location" id="wall-item-location-$item.id">$item.location</div>
+                       </div>
+               </div>
+               <!--<div class="wall-item-author">-->
+                               <a href="$item.profile_url" target="redir" title="$item.linktitle" class="wall-item-name-link"><span class="wall-item-name$item.sparkle" id="wall-item-name-$item.id" >$item.name</span></a> $item.to <a href="$item.owner_url" target="redir" title="$item.olinktitle" class="wall-item-name-link"><span class="wall-item-name$item.osparkle" id="wall-item-ownername-$item.id">$item.owner_name</span></a> $item.vwall<br />
+                               <div class="wall-item-ago"  id="wall-item-ago-$item.id">$item.ago</div>                         
+               <!--</div>-->
+               <div class="wall-item-content" id="wall-item-content-$item.id" >
+                       <div class="wall-item-title" id="wall-item-title-$item.id">$item.title</div>
+                       <!--<div class="wall-item-title-end"></div>-->
+                       <div class="wall-item-body" id="wall-item-body-$item.id" >$item.body
+                                       <!--<div class="body-tag">-->
+                                               {{ for $item.tags as $tag }}
+                                                       <span class='body-tag tag'>$tag</span>
+                                               {{ endfor }}
+                                       <!--</div>-->
+                       </div>
+               </div>
+               <div class="wall-item-tools" id="wall-item-tools-$item.id">
+                       {{ if $item.vote }}
+                       <div class="wall-item-like-buttons" id="wall-item-like-buttons-$item.id">
+                               <a href="#" class="icon like" title="$item.vote.like.0" onclick="dolike($item.id,'like'); return false"></a>
+                               <a href="#" class="icon dislike" title="$item.vote.dislike.0" onclick="dolike($item.id,'dislike'); return false"></a>
+                               {{ if $item.vote.share }}<a href="#" class="icon recycle wall-item-share-buttons" title="$item.vote.share.0" onclick="jotShare($item.id); return false"></a>{{ endif }}
+                               <img id="like-rotator-$item.id" class="like-rotator" src="images/rotator.gif" alt="$item.wait" title="$item.wait" style="display: none;" />
+                       </div>
+                       {{ endif }}
+                       {{ if $item.plink }}
+                               <!--<div class="wall-item-links-wrapper">--><a href="$item.plink.href" title="$item.plink.title" target="external-link" class="wall-item-links-wrapper icon remote-link$item.sparkle"></a><!--</div>-->
+                       {{ endif }}
+                       {{ if $item.edpost }}
+                               <a class="editpost icon pencil" href="$item.edpost.0" title="$item.edpost.1"></a>
+                       {{ endif }}
+                        
+                       {{ if $item.star }}
+                       <a href="#" id="starred-$item.id" onclick="dostar($item.id); return false;" class="star-item icon $item.isstarred" title="$item.star.toggle"></a>
+                       <a href="#" id="tagger-$item.id" onclick="itemTag($item.id); return false;" class="tag-item icon tagged" title="$item.star.tagger"></a>
+                       {{ endif }}
+                       {{ if $item.filer }}
+                       <a href="#" id="filer-$item.id" onclick="itemFiler($item.id); return false;" class="filer-item filer-icon" title="$item.filer"></a>
+                       {{ endif }}                     
+                       
+                       <!--<div class="wall-item-delete-wrapper" id="wall-item-delete-wrapper-$item.id" >-->
+                               {{ if $item.drop.dropping }}<a href="item/drop/$item.id" onclick="return confirmDelete();" class="wall-item-delete-wrapper icon drophide" title="$item.drop.delete" onmouseover="imgbright(this);" onmouseout="imgdull(this);" ></a>{{ endif }}
+                       <!--</div>-->
+                               {{ if $item.drop.dropping }}<input type="checkbox" onclick="checkboxhighlight(this);" title="$item.drop.select" class="item-select" name="itemselected[]" value="$item.id" />{{ endif }}
+                       <!--<div class="wall-item-delete-end"></div>-->
+               </div>
+       </div>  
+       <!--<div class="wall-item-wrapper-end"></div>-->
+       <div class="wall-item-like $item.indent" id="wall-item-like-$item.id">$item.like</div>
+       <div class="wall-item-dislike $item.indent" id="wall-item-dislike-$item.id">$item.dislike</div>
+       <div class="wall-item-comment-separator"></div>
+<!--   <div class="wall-item-comment-wrapper">-->
+       $item.comment
+<!--   </div>-->
+
+<!--<div class="wall-item-outside-wrapper-end$item.indent" ></div>-->
+<!--</div>-->
+

diff --git a/view/theme/frost/comment_item.tpl b/view/theme/frost/comment_item.tpl
index 2b15cbc7ee4899363a05c91b151bf68d3f349133..bdc2ef5e6db3b2f04de5a5c0f511e71ea9cbef51 100755 (executable)
--- a/view/theme/frost/comment_item.tpl
+++ b/view/theme/frost/comment_item.tpl
@@ -19,10 +19,10 @@
                                <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 class="comment-edit-photo" id="comment-edit-photo-$id" >-->
+                                       <a class="comment-edit-photo comment-edit-photo-link" id="comment-edit-photo-$id" 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"
@@ -49,7 +49,7 @@
                                                style="cursor: pointer;" title="$edvideo"
                                                onclick="insertFormatting('$comment','video', $id);"></a></li>
                                </ul>   
-                               <div class="comment-edit-bb-end"></div>
+<!--                           <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);cmtBbClose($id);" >$comment</textarea>-->
                                <textarea id="comment-edit-text-$id" class="comment-edit-text-empty" name="body" onFocus="commentOpen(this,$id);cmtBbOpen($id);" >$comment</textarea>
                                {{ if $qcomment }}
@@ -68,7 +68,7 @@
                                        <div id="comment-edit-preview-$id" class="comment-edit-preview" style="display:none;"></div>
                                </div>
 
-                               <div class="comment-edit-end"></div>
+                               <!--<div class="comment-edit-end"></div>-->
                        </form>
 
                </div>

diff --git a/view/theme/frost/nav.tpl b/view/theme/frost/nav.tpl
index da7554257d1c20c238a56906efa585115a35dc4f..6ae19650e02bf5aea7875a4ac3555dfe099e0758 100644 (file)
--- a/view/theme/frost/nav.tpl
+++ b/view/theme/frost/nav.tpl
@@ -3,8 +3,6 @@
 
        <div id="site-location">$sitelocation</div>
 
-       {{ 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> {{ endif }}
-
        <span id="nav-link-wrapper" >
 
 <!--   <a id="system-menu-link" class="nav-link" href="#system-menu" title="Menu">Menu</a>-->
@@ -13,11 +11,19 @@
        <img class="system-menu-link" src="/view/theme/frost/images/menu.png">
        </a>
        <ul id="system-menu-list" class="nav-menu-list">
-                       {{ if $nav.manage }}
-                       <li>
-                       <a id="nav-manage-link" class="nav-link $nav.manage.2 $sel.manage" href="$nav.manage.0" title="$nav.manage.3">$nav.manage.1</a>
-                       </li>
-                       {{ endif }}
+               {{ if $nav.login }}
+               <a id="nav-login-link" class="nav-load-page-link $nav.login.2" href="$nav.login.0" title="$nav.login.3" >$nav.login.1</a>
+               {{ endif }}
+
+               {{ if $nav.register }}
+               <a id="nav-register-link" class="nav-load-page-link $nav.register.2 $sel.register" href="$nav.register.0" title="$nav.register.3" >$nav.register.1</a>
+               {{ endif }}
+
+               {{ if $nav.manage }}
+               <li>
+               <a id="nav-manage-link" class="nav-load-page-link $nav.manage.2 $sel.manage" href="$nav.manage.0" title="$nav.manage.3">$nav.manage.1</a>
+               </li>
+               {{ endif }}
 
                {{ if $nav.settings }}
                <li><a id="nav-settings-link" class="$nav.settings.2 nav-load-page-link" href="$nav.settings.0" title="$nav.settings.3">$nav.settings.1</a></li>
@@ -123,11 +129,9 @@
                {{ endif }}
        </ul>
        </div>
-
-       {{ if $nav.register }}<a id="nav-register-link" class="nav-commlink $nav.register.2 $sel.register" href="$nav.register.0" title="$nav.register.3" >$nav.register.1</a>{{ endif }}
                
        </span>
-       <span id="nav-end"></span>
+       <!--<span id="nav-end"></span>-->
        <span id="banner">$banner</span>
 </nav>
 

diff --git a/view/theme/frost/style.css b/view/theme/frost/style.css
index 6e52c888fd015ff00cb1c99a4309a207ddceacfe..9f4d54c67c3978085ebe80fe642e0e80cacba34d 100644 (file)
--- a/view/theme/frost/style.css
+++ b/view/theme/frost/style.css
@@ -1157,7 +1157,7 @@ input#dfrn-url {
        display: none;
        z-index: 10000;
 }
-.wall-item-photo-menu ul { margin:0px; padding: 0px; list-style: none }
+.wall-item-photo-menu { margin:0px; padding: 0px; list-style: none }
 .wall-item-photo-menu li a { display: block; padding: 2px; }
 .wall-item-photo-menu li a:hover { color: #FFFFFF; background: #3465A4; text-decoration: none; }
 
@@ -1177,7 +1177,7 @@ input#dfrn-url {
        height: 30px !important;
 }
 
-.wallwall .wall-item-photo-end {
+.wallwall /*.wall-item-photo-end*/ {
        clear: both;
 }
 
@@ -1267,18 +1267,18 @@ input#dfrn-url {
        float: right;
 }
 
-.wall-item-delete-end {
+/*.wall-item-delete-end {
        clear: both;
-}
+}*/
 
 .wall-item-delete-icon {
        border: none;
 }
 
 
-.wall-item-wrapper-end {
+/*.wall-item-wrapper-end {
        clear: both;
-}
+}*/
 .wall-item-name-link {
        font-weight: bold;
        text-decoration: none;
@@ -1311,9 +1311,9 @@ input#dfrn-url {
        /*width: 450px;*/
 }
 
-.wall-item-title-end {
+/*.wall-item-title-end {
        clear: both;
-}
+}*/
 
 .wall-item-body {
        text-align: justify;
@@ -1357,6 +1357,7 @@ input#dfrn-url {
 }
 
 .comment-wwedit-wrapper {
+       display: block;
        margin-top: 15px;
        background: #f3f3f3;
        margin-left: 50px;

diff --git a/view/theme/frost/wall_item.tpl b/view/theme/frost/wall_item.tpl
index 60dde76000d72012fea6933ea7bbea3776d4f54e..68950f4911d6a9ec83b8b0a906bf8a8052b8e02a 100644 (file)
--- a/view/theme/frost/wall_item.tpl
+++ b/view/theme/frost/wall_item.tpl
@@ -1,5 +1,5 @@
 <a name="$item.id" ></a>
-<div class="wall-item-outside-wrapper$item.indent$item.previewing" id="wall-item-outside-wrapper-$item.id" >
+<!--<div class="wall-item-outside-wrapper$item.indent$item.previewing" id="wall-item-outside-wrapper-$item.id" >-->
        <div class="wall-item-content-wrapper$item.indent" id="wall-item-content-wrapper-$item.id" >
                <div class="wall-item-info" id="wall-item-info-$item.id">
                        <div class="wall-item-photo-wrapper" id="wall-item-photo-wrapper-$item.id" 
@@ -9,33 +9,33 @@
                                        <img src="$item.thumb" class="wall-item-photo$item.sparkle" id="wall-item-photo-$item.id" style="height: 80px; width: 80px;" alt="$item.name" />
                                </a>
                                <span onclick="openClose('wall-item-photo-menu-$item.id');" class="fakelink wall-item-photo-menu-button" id="wall-item-photo-menu-button-$item.id">menu</span>
-                               <div class="wall-item-photo-menu" id="wall-item-photo-menu-$item.id">
-                                       <ul>
+                               <!--<div class="wall-item-photo-menu" id="wall-item-photo-menu-$item.id">-->
+                                       <ul class="wall-item-photo-menu" id="wall-item-photo-menu-$item.id">
                                                $item.item_photo_menu
                                        </ul>
-                               </div>
+                               <!--</div>-->
                        </div>
-                       <div class="wall-item-photo-end"></div>
+                       <!--<div class="wall-item-photo-end"></div>-->
                        <div class="wall-item-wrapper" id="wall-item-wrapper-$item.id" >
-                               {{ if $item.lock }}<div class="wall-item-lock"><img src="images/lock_icon.gif" class="lockview" alt="$item.lock" onclick="lockview(event,$item.id);" /></div>
+                               {{ if $item.lock }}<!--<div class="wall-item-lock">--><img src="images/lock_icon.gif" class="wall-item-lock lockview" alt="$item.lock" onclick="lockview(event,$item.id);" /><!--</div>-->
                                {{ else }}<div class="wall-item-lock"></div>{{ endif }} 
                                <div class="wall-item-location" id="wall-item-location-$item.id">$item.location</div>                           
                        </div>
                </div>
-               <div class="wall-item-author">
+               <!--<div class="wall-item-author">-->
                                <a href="$item.profile_url" target="redir" title="$item.linktitle" class="wall-item-name-link"><span class="wall-item-name$item.sparkle" id="wall-item-name-$item.id" >$item.name</span></a>
                                <div class="wall-item-ago"  id="wall-item-ago-$item.id">$item.ago</div>
                                
-               </div>  
+               <!--</div>-->
                <div class="wall-item-content" id="wall-item-content-$item.id" >
                        <div class="wall-item-title" id="wall-item-title-$item.id">$item.title</div>
-                       <div class="wall-item-title-end"></div>
+                       <!--<div class="wall-item-title-end"></div>-->
                        <div class="wall-item-body" id="wall-item-body-$item.id" >$item.body
-                                       <div class="body-tag">
+<!--                                   <div class="body-tag">-->
                                                {{ for $item.tags as $tag }}
-                                                       <span class='tag'>$tag</span>
+                                                       <span class='body-tag tag'>$tag</span>
                                                {{ endfor }}
-                                       </div>
+<!--                                   </div>-->
                        </div>
                </div>
                <div class="wall-item-tools" id="wall-item-tools-$item.id">
@@ -48,7 +48,7 @@
                        </div>
                        {{ endif }}
                        {{ if $item.plink }}
-                               <div class="wall-item-links-wrapper"><a href="$item.plink.href" title="$item.plink.title" target="external-link" class="icon remote-link$item.sparkle"></a></div>
+                               <!--<div class="wall-item-links-wrapper">--><a href="$item.plink.href" title="$item.plink.title" target="external-link" class="wall-item-links-wrapper icon remote-link$item.sparkle"></a><!--</div>-->
                        {{ endif }}
                        {{ if $item.edpost }}
                                <a class="editpost icon pencil" href="$item.edpost.0" title="$item.edpost.1"></a>
@@ -61,19 +61,19 @@
                        {{ if $item.filer }}
                        <a href="#" id="filer-$item.id" onclick="itemFiler($item.id); return false;" class="filer-item filer-icon" title="$item.filer"></a>
                        {{ endif }}                     
-                       <div class="wall-item-delete-wrapper" id="wall-item-delete-wrapper-$item.id" >
-                               {{ if $item.drop.dropping }}<a href="item/drop/$item.id" onclick="return confirmDelete();" class="icon drophide" title="$item.drop.delete" onmouseover="imgbright(this);" onmouseout="imgdull(this);" ></a>{{ endif }}
-                       </div>
+<!--                   <div class="wall-item-delete-wrapper" id="wall-item-delete-wrapper-$item.id" >-->
+                               {{ if $item.drop.dropping }}<a href="item/drop/$item.id" onclick="return confirmDelete();" class="wall-item-delete-wrapper icon drophide" title="$item.drop.delete" id="wall-item-delete-wrapper-$item.id" onmouseover="imgbright(this);" onmouseout="imgdull(this);" ></a>{{ endif }}
+<!--                   </div>-->
                                {{ if $item.drop.dropping }}<input type="checkbox" onclick="checkboxhighlight(this);" title="$item.drop.select" class="item-select" name="itemselected[]" value="$item.id" />{{ endif }}
-                       <div class="wall-item-delete-end"></div>
+                       <!--<div class="wall-item-delete-end"></div>-->
                </div>
        </div>
-       <div class="wall-item-wrapper-end"></div>
+       <!--<div class="wall-item-wrapper-end"></div>-->
        <div class="wall-item-like $item.indent" id="wall-item-like-$item.id">$item.like</div>
        <div class="wall-item-dislike $item.indent" id="wall-item-dislike-$item.id">$item.dislike</div>
-       <div class="wall-item-comment-wrapper" >
+<!--   <div class="wall-item-comment-wrapper" >-->
        $item.comment
-       </div>
+<!--   </div>-->
 
-<div class="wall-item-outside-wrapper-end$item.indent" ></div>
-</div>
+<!--<div class="wall-item-outside-wrapper-end$item.indent" ></div>-->
+<!--</div>-->

diff --git a/view/theme/frost/wallwall_item.tpl b/view/theme/frost/wallwall_item.tpl
new file mode 100644 (file)
index 0000000..c1b2820
--- /dev/null
+++ b/view/theme/frost/wallwall_item.tpl
@@ -0,0 +1,86 @@
+<a name="$item.id" ></a>
+<!--<div class="wall-item-outside-wrapper$item.indent$item.previewing wallwall" id="wall-item-outside-wrapper-$item.id" >-->
+       <div class="wall-item-content-wrapper$item.indent" id="wall-item-content-wrapper-$item.id" >
+               <div class="wall-item-info wallwall" id="wall-item-info-$item.id">
+                       <div class="wall-item-photo-wrapper wwto" id="wall-item-ownerphoto-wrapper-$item.id" >
+                               <a href="$item.owner_url" target="redir" title="$item.olinktitle" class="wall-item-photo-link" id="wall-item-ownerphoto-link-$item.id">
+                               <img src="$item.owner_photo" class="wall-item-photo$item.osparkle" id="wall-item-ownerphoto-$item.id" style="height: 80px; width: 80px;" alt="$item.owner_name" /></a>
+                       </div>
+                       <div class="wall-item-arrowphoto-wrapper" ><img src="images/larrow.gif" alt="$item.wall" /></div>
+                       <div class="wall-item-photo-wrapper wwfrom" id="wall-item-photo-wrapper-$item.id" 
+                               onmouseover="if (typeof t$item.id != 'undefined') clearTimeout(t$item.id); openMenu('wall-item-photo-menu-button-$item.id')"
+                onmouseout="t$item.id=setTimeout('closeMenu(\'wall-item-photo-menu-button-$item.id\'); closeMenu(\'wall-item-photo-menu-$item.id\');',200)">
+                               <a href="$item.profile_url" target="redir" title="$item.linktitle" class="wall-item-photo-link" id="wall-item-photo-link-$item.id">
+                               <img src="$item.thumb" class="wall-item-photo$item.sparkle" id="wall-item-photo-$item.id" style="height: 80px; width: 80px;" alt="$item.name" /></a>
+                               <span onclick="openClose('wall-item-photo-menu-$item.id');" class="fakelink wall-item-photo-menu-button" id="wall-item-photo-menu-button-$item.id">menu</span>
+<!--                <div class="wall-item-photo-menu" id="wall-item-photo-menu-$item.id">-->
+                    <ul class="wall-item-photo-menu" id="wall-item-photo-menu-$item.id">
+                        $item.item_photo_menu
+                    </ul>
+<!--                </div>-->
+
+                       </div>
+                       <!--<div class="wall-item-photo-end"></div>-->
+                       <div class="wall-item-wrapper" id="wall-item-wrapper-$item.id" >
+                               {{ if $item.lock }}<div class="wall-item-lock"><img src="images/lock_icon.gif" class="lockview" alt="$item.lock" onclick="lockview(event,$item.id);" /></div>
+                               {{ else }}<div class="wall-item-lock"></div>{{ endif }} 
+                               <div class="wall-item-location" id="wall-item-location-$item.id">$item.location</div>
+                       </div>
+               </div>
+               <!--<div class="wall-item-author">-->
+                               <a href="$item.profile_url" target="redir" title="$item.linktitle" class="wall-item-name-link"><span class="wall-item-name$item.sparkle" id="wall-item-name-$item.id" >$item.name</span></a> $item.to <a href="$item.owner_url" target="redir" title="$item.olinktitle" class="wall-item-name-link"><span class="wall-item-name$item.osparkle" id="wall-item-ownername-$item.id">$item.owner_name</span></a> $item.vwall<br />
+                               <div class="wall-item-ago"  id="wall-item-ago-$item.id">$item.ago</div>                         
+               <!--</div>-->
+               <div class="wall-item-content" id="wall-item-content-$item.id" >
+                       <div class="wall-item-title" id="wall-item-title-$item.id">$item.title</div>
+                       <!--<div class="wall-item-title-end"></div>-->
+                       <div class="wall-item-body" id="wall-item-body-$item.id" >$item.body
+                                       <!--<div class="body-tag">-->
+                                               {{ for $item.tags as $tag }}
+                                                       <span class='body-tag tag'>$tag</span>
+                                               {{ endfor }}
+                                       <!--</div>-->
+                       </div>
+               </div>
+               <div class="wall-item-tools" id="wall-item-tools-$item.id">
+                       {{ if $item.vote }}
+                       <div class="wall-item-like-buttons" id="wall-item-like-buttons-$item.id">
+                               <a href="#" class="icon like" title="$item.vote.like.0" onclick="dolike($item.id,'like'); return false"></a>
+                               <a href="#" class="icon dislike" title="$item.vote.dislike.0" onclick="dolike($item.id,'dislike'); return false"></a>
+                               {{ if $item.vote.share }}<a href="#" class="icon recycle wall-item-share-buttons" title="$item.vote.share.0" onclick="jotShare($item.id); return false"></a>{{ endif }}
+                               <img id="like-rotator-$item.id" class="like-rotator" src="images/rotator.gif" alt="$item.wait" title="$item.wait" style="display: none;" />
+                       </div>
+                       {{ endif }}
+                       {{ if $item.plink }}
+                               <!--<div class="wall-item-links-wrapper">--><a href="$item.plink.href" title="$item.plink.title" target="external-link" class="wall-item-links-wrapper icon remote-link$item.sparkle"></a><!--</div>-->
+                       {{ endif }}
+                       {{ if $item.edpost }}
+                               <a class="editpost icon pencil" href="$item.edpost.0" title="$item.edpost.1"></a>
+                       {{ endif }}
+                        
+                       {{ if $item.star }}
+                       <a href="#" id="starred-$item.id" onclick="dostar($item.id); return false;" class="star-item icon $item.isstarred" title="$item.star.toggle"></a>
+                       <a href="#" id="tagger-$item.id" onclick="itemTag($item.id); return false;" class="tag-item icon tagged" title="$item.star.tagger"></a>
+                       {{ endif }}
+                       {{ if $item.filer }}
+                       <a href="#" id="filer-$item.id" onclick="itemFiler($item.id); return false;" class="filer-item filer-icon" title="$item.filer"></a>
+                       {{ endif }}                     
+                       
+                       <!--<div class="wall-item-delete-wrapper" id="wall-item-delete-wrapper-$item.id" >-->
+                               {{ if $item.drop.dropping }}<a href="item/drop/$item.id" onclick="return confirmDelete();" class="wall-item-delete-wrapper icon drophide" title="$item.drop.delete" onmouseover="imgbright(this);" onmouseout="imgdull(this);" ></a>{{ endif }}
+                       <!--</div>-->
+                               {{ if $item.drop.dropping }}<input type="checkbox" onclick="checkboxhighlight(this);" title="$item.drop.select" class="item-select" name="itemselected[]" value="$item.id" />{{ endif }}
+                       <!--<div class="wall-item-delete-end"></div>-->
+               </div>
+       </div>  
+       <!--<div class="wall-item-wrapper-end"></div>-->
+       <div class="wall-item-like $item.indent" id="wall-item-like-$item.id">$item.like</div>
+       <div class="wall-item-dislike $item.indent" id="wall-item-dislike-$item.id">$item.dislike</div>
+       <div class="wall-item-comment-separator"></div>
+<!--   <div class="wall-item-comment-wrapper">-->
+       $item.comment
+<!--   </div>-->
+
+<!--<div class="wall-item-outside-wrapper-end$item.indent" ></div>-->
+<!--</div>-->
+