]> git.mxchange.org Git - friendica.git/commitdiff
themes: use duepuntozero tpls as default
authorFabio Comuni <fabrix.xm@gmail.com>
Mon, 26 Mar 2012 07:09:14 +0000 (09:09 +0200)
committerFabio Comuni <fabrix.xm@gmail.com>
Mon, 26 Mar 2012 07:09:14 +0000 (09:09 +0200)
36 files changed:
view/comment_item.tpl
view/contact_template.tpl
view/conversation.tpl
view/group_side.tpl
view/jot.tpl
view/nav.tpl
view/nets.tpl
view/profile_vcard.tpl
view/saved_searches_aside.tpl
view/search_item.tpl
view/theme/duepuntozero/comment_item.tpl [deleted file]
view/theme/duepuntozero/contact_template.tpl [deleted file]
view/theme/duepuntozero/conversation.tpl [deleted file]
view/theme/duepuntozero/group_side.tpl [deleted file]
view/theme/duepuntozero/jot.tpl [deleted file]
view/theme/duepuntozero/nav.tpl [deleted file]
view/theme/duepuntozero/nets.tpl [deleted file]
view/theme/duepuntozero/profile_vcard.tpl [deleted file]
view/theme/duepuntozero/saved_searches_aside.tpl [deleted file]
view/theme/duepuntozero/search_item.tpl [deleted file]
view/theme/duepuntozero/wall_item.tpl [deleted file]
view/theme/duepuntozero/wallwall_item.tpl [deleted file]
view/theme/quattro/comment_item.tpl [new file with mode: 0755]
view/theme/quattro/contact_template.tpl [new file with mode: 0755]
view/theme/quattro/conversation.tpl [new file with mode: 0755]
view/theme/quattro/group_side.tpl [new file with mode: 0755]
view/theme/quattro/jot.tpl [new file with mode: 0755]
view/theme/quattro/nav.tpl [new file with mode: 0755]
view/theme/quattro/nets.tpl [new file with mode: 0755]
view/theme/quattro/profile_vcard.tpl [new file with mode: 0755]
view/theme/quattro/saved_searches_aside.tpl [new file with mode: 0755]
view/theme/quattro/search_item.tpl [new file with mode: 0755]
view/theme/quattro/wall_item.tpl [new file with mode: 0755]
view/theme/quattro/wallwall_item.tpl [new file with mode: 0755]
view/wall_item.tpl
view/wallwall_item.tpl

index cde4ca3ca8d497217bd6557f7676de4071894df9..3503c3843eea13e93a8d9b73b8fe6f7b5df45489 100755 (executable)
                                        <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 }}
-                               <textarea id="comment-edit-text-$id" class="comment-edit-text-empty" name="body" onFocus="commentOpen(this,$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;" >
index b826acc65d5c607acb7a60b752988a4ced8f5706..48930b48aba19923041570aef1e9e061f0d5cc8b 100755 (executable)
@@ -1,26 +1,25 @@
 
-<div class="contact-wrapper" id="contact-entry-wrapper-$id" >
-       <div class="contact-photo-wrapper" >
-               <div class="contact-photo mframe" id="contact-entry-photo-$contact.id"
+<div class="contact-entry-wrapper" id="contact-entry-wrapper-$contact.id" >
+       <div class="contact-entry-photo-wrapper" >
+               <div class="contact-entry-photo mframe" id="contact-entry-photo-$contact.id"
                onmouseover="if (typeof t$contact.id != 'undefined') clearTimeout(t$contact.id); openMenu('contact-photo-menu-button-$contact.id')" 
                onmouseout="t$contact.id=setTimeout('closeMenu(\'contact-photo-menu-button-$contact.id\'); closeMenu(\'contact-photo-menu-$contact.id\');',200)" >
 
                        <a href="$contact.url" title="$contact.img_hover" /><img src="$contact.thumb" $contact.sparkle alt="$contact.name" /></a>
 
                        {{ if $contact.photo_menu }}
-                       <a href="#" rel="#contact-photo-menu-$contact.id" class="contact-photo-menu-button icon s16 menu" id="contact-photo-menu-button-$contact.id">menu</a>
-                       <ul class="contact-photo-menu menu-popup" id="contact-photo-menu-$contact.id">
-                               $contact.photo_menu
-                       </ul>
+                       <span onclick="openClose('contact-photo-menu-$contact.id');" class="fakelink contact-photo-menu-button" id="contact-photo-menu-button-$contact.id">menu</span>
+                <div class="contact-photo-menu" id="contact-photo-menu-$contact.id">
+                    <ul>
+                        $contact.photo_menu
+                    </ul>
+                </div>
                        {{ endif }}
                </div>
                        
        </div>
-       <div class="contact-name" id="contact-entry-name-$contact.id" >$contact.name</div>
-       {{ if $contact.alt_text }}<div class="contact-details" id="contact-entry-rel-$contact.id" >$contact.alt_text</div>{{ endif }}
-       <div class="contact-details" id="contact-entry-url-$contact.id" >$contact.itemurl</div>
-       <div class="contact-details" id="contact-entry-network-$contact.id" >$contact.network</div>
-
+       <div class="contact-entry-photo-end" ></div>
+               <div class="contact-entry-name" id="contact-entry-name-$contact.id" >$contact.name</div>
 
+       <div class="contact-entry-end" ></div>
 </div>
-
index ff202bbe44077569c23de4c00710d2a42265b607..43bb1dd47006d8a3b4ae944969f55b8d94df3f9c 100755 (executable)
@@ -17,7 +17,9 @@
 {{ endfor }}
 
 {{ if $dropping }}
-<a href="#" onclick="deleteCheckedItems();return false;">
-       <span class="icon s22 delete text">$dropping</span>
-</a>
+<div id="item-delete-selected" class="fakelink" onclick="deleteCheckedItems();">
+  <div id="item-delete-selected-icon" class="icon drophide" title="$dropping" onmouseover="imgbright(this);" onmouseout="imgdull(this);" ></div>
+  <div id="item-delete-selected-desc" >$dropping</div>
+</div>
+<div id="item-delete-selected-end"></div>
 {{ endif }}
index 596a8d13fdae1e1db63bf3c9ad7f48390bc08949..0353b1d2ccf464713c5cba3e3a45577e273d7ea4 100755 (executable)
@@ -1,29 +1,28 @@
-<div id="group-sidebar" class="widget">
-       <div class="title tool">
-               <h3 class="label">$title</h3>
-               <a href="group/new" title="$createtext" class="action"><span class="icon text s16 add"> $add</span></a>
-       </div>
+<div class="widget" id="group-sidebar">
+<h3>$title</h3>
 
-       <div id="sidebar-group-list">
-               <ul>
-                       {{ for $groups as $group }}
-                       <li class="tool  {{ if $group.selected }}selected{{ endif }}">
-                               <a href="$group.href" class="label">
-                                       $group.text
-                               </a>
-                               {{ if $group.edit }}
-                                       <a href="$group.edit.href" class="action"><span class="icon text s10 edit">$group.edit.title</span></a>
-                               {{ endif }}
+<div id="sidebar-group-list">
+       <ul id="sidebar-group-ul">
+               {{ for $groups as $group }}
+                       <li class="sidebar-group-li">
                                {{ if $group.cid }}
                                        <input type="checkbox" 
                                                class="{{ if $group.selected }}ticked{{ else }}unticked {{ endif }} action" 
                                                onclick="contactgroupChangeMember('$group.id','$group.cid');return true;"
                                                {{ if $group.ismember }}checked="checked"{{ endif }}
                                        />
+                               {{ endif }}                     
+                               {{ if $group.edit }}
+                                       <a class="groupsideedit" href="$group.edit.href" title="$edittext"><span id="edit-sidebar-group-element-$group.id" class="group-edit-icon iconspacer small-pencil"></span></a>
                                {{ endif }}
+                               <a id="sidebar-group-element-$group.id" class="sidebar-group-element {{ if $group.selected }}group-selected{{ endif }}" href="$group.href">$group.text</a>
                        </li>
-                       {{ endfor }}
-               </ul>
+               {{ endfor }}
+       </ul>
        </div>
-</div> 
+  <div id="sidebar-new-group">
+  <a href="group/new">$createtext</a>
+  </div>
+</div>
+
 
index 2f89d437214ed35c340154389951e8e792005648..5fe1f954ee24eb9f82ac17840fa0579f04be7f26 100755 (executable)
@@ -1,9 +1,12 @@
-<form id="profile-jot-form" action="$action" method="post">
-       <div id="jot">
-               <div id="profile-jot-desc" class="jothidden">&nbsp;</div>
-               <input name="title" id="jot-title" type="text" placeholder="$placeholdertitle" value="$title" class="jothidden" style="display:none" />
-               <div id="character-counter" class="grey jothidden"></div>
 
+<div id="profile-jot-wrapper" >
+       <div id="profile-jot-banner-wrapper">
+               <div id="profile-jot-desc" >&nbsp;</div>
+               <div id="character-counter" class="grey"></div>
+       </div>
+       <div id="profile-jot-banner-end"></div>
+
+       <form id="profile-jot-form" action="$action" method="post" >
                <input type="hidden" name="type" value="$ptyp" />
                <input type="hidden" name="profile_uid" value="$profile_uid" />
                <input type="hidden" name="return" value="$return_path" />
                <input type="hidden" name="coord" id="jot-coord" value="" />
                <input type="hidden" name="post_id" value="$post_id" />
                <input type="hidden" name="preview" id="jot-preview" value="0" />
-
+               <div id="jot-title-wrap"><input name="title" id="jot-title" type="text" placeholder="$placeholdertitle" value="$title" class="jothidden" style="display:none"></div>
+               <div id="jot-text-wrap">
+               <img id="profile-jot-text-loading" src="images/rotator.gif" alt="$wait" title="$wait" style="display: none;" />
                <textarea rows="5" cols="64" class="profile-jot-text" id="profile-jot-text" name="body" >{{ if $content }}$content{{ else }}$share{{ endif }}</textarea>
+               </div>
+
+<div id="profile-jot-submit-wrapper" class="jothidden">
+       <input type="submit" id="profile-jot-submit" name="submit" value="$share" />
+
+       <div id="profile-upload-wrapper" style="display: $visitor;" >
+               <div id="wall-image-upload-div" ><a href="#" onclick="return false;" id="wall-image-upload" class="icon camera" title="$upload"></a></div>
+       </div> 
+       <div id="profile-attach-wrapper" style="display: $visitor;" >
+               <div id="wall-file-upload-div" ><a href="#" onclick="return false;" id="wall-file-upload" class="icon attach" title="$attach"></a></div>
+       </div> 
+
+       <div id="profile-link-wrapper" style="display: $visitor;" ondragenter="linkdropper(event);" ondragover="linkdropper(event);" ondrop="linkdrop(event);" >
+               <a id="profile-link" class="icon link" title="$weblink" ondragenter="return linkdropper(event);" ondragover="return linkdropper(event);" ondrop="linkdrop(event);" onclick="jotGetLink(); return false;"></a>
+       </div> 
+       <div id="profile-video-wrapper" style="display: $visitor;" >
+               <a id="profile-video" class="icon video" title="$video" onclick="jotVideoURL();return false;"></a>
+       </div> 
+       <div id="profile-audio-wrapper" style="display: $visitor;" >
+               <a id="profile-audio" class="icon audio" title="$audio" onclick="jotAudioURL();return false;"></a>
+       </div> 
+       <div id="profile-location-wrapper" style="display: $visitor;" >
+               <a id="profile-location" class="icon globe" title="$setloc" onclick="jotGetLocation();return false;"></a>
+       </div> 
+       <div id="profile-nolocation-wrapper" style="display: none;" >
+               <a id="profile-nolocation" class="icon noglobe" title="$noloc" onclick="jotClearLocation();return false;"></a>
+       </div> 
+
+       <div id="profile-jot-perms" class="profile-jot-perms" style="display: $pvisit;" >
+               <a href="#profile-jot-acl-wrapper" id="jot-perms-icon" class="icon $lockstate"  title="$permset" ></a>$bang
+       </div>
+
+       <span onclick="preview_post();" id="jot-preview-link" class="fakelink">$preview</span>
+
+       <div id="profile-jot-perms-end"></div>
+
 
-               <ul id="jot-tools" class="jothidden" style="display:none">
-                       <li><a href="#" onclick="return false;" id="wall-image-upload" title="$upload">$shortupload</a></a></li>
-                       <li><a href="#" onclick="return false;" id="wall-file-upload"  title="$attach">$shortattach</a></li>
-                       <li><a id="profile-link"  ondragenter="return linkdropper(event);" ondragover="return linkdropper(event);" ondrop="linkdrop(event);" onclick="jotGetLink(); return false;" title="$weblink">$shortweblink</a></li>
-                       <li><a id="profile-video" onclick="jotVideoURL();return false;" title="$gvideo">$shortvideo</a></li>
-                       <li><a id="profile-audio" onclick="jotAudioURL();return false;" title="$audio">$shortaudio</a></li>
-                       <li><a id="profile-location" onclick="jotGetLocation();return false;" title="$setloc">$shortsetloc</a></li>
-                       <li><a id="profile-nolocation" onclick="jotClearLocation();return false;" title="$noloc">$shortnoloc</a></li>
-                       <li><a id="jot-preview-link" onclick="preview_post(); return false;" title="$preview">$preview</a></li>
-                       $jotplugins
-
-                       <li class="perms"><a id="jot-perms-icon" href="#profile-jot-acl-wrapper" class="icon s22 $lockstate $bang"  title="$permset" ></a></li>
-                       <li class="submit"><input type="submit" id="profile-jot-submit" name="submit" value="$share" /></li>
-                       <li id="profile-rotator" class="loading" style="display: none"><img src="images/rotator.gif" alt="$wait" title="$wait"  /></li>
-               </ul>
+       <div id="profile-jot-plugin-wrapper">
+       $jotplugins
        </div>
+
+       <div id="profile-rotator-wrapper" style="display: $visitor;" >
+               <img id="profile-rotator" src="images/rotator.gif" alt="$wait" title="$wait" style="display: none;" />
+       </div> 
        
        <div id="jot-preview-content" style="display:none;"></div>
 
                </div>
        </div>
 
-</form>
 
-{{ if $content }}<script>initEditor();</script>{{ endif }}
+</div>
+
+<div id="profile-jot-end"></div>
+</form>
+</div>
+               {{ if $content }}<script>initEditor();</script>{{ endif }}
index 8c872864c2c0e2ad0a1b4c62d1387c3baca9da84..4675c3e5c22571f95a3e2935b2e6c14339b58331 100755 (executable)
-<header>
-       {# $langselector #}
+<nav>
+       $langselector
 
        <div id="site-location">$sitelocation</div>
-       <div id="banner">$banner</div>
-</header>
-<nav>
-       <ul>
-               {{ if $userinfo }}
-                       <li id="nav-user-linkmenu" class="nav-menu-icon"><a href="#" rel="#nav-user-menu" title="$sitelocation"><img src="$userinfo.icon" alt="$userinfo.name"></a>
-                               <ul id="nav-user-menu" class="menu-popup">
-                                       {{ for $nav.usermenu as $usermenu }}
-                                               <li><a class="$usermenu.2" href="$usermenu.0" title="$usermenu.3">$usermenu.1</a></li>
-                                       {{ endfor }}
-                                       
-                                       {{ if $nav.notifications }}<li><a class="$nav.notifications.2" href="$nav.notifications.0" title="$nav.notifications.3" >$nav.notifications.1</a></li>{{ endif }}
-                                       {{ if $nav.messages }}<li><a class="$nav.messages.2" href="$nav.messages.0" title="$nav.messages.3" >$nav.messages.1</a></li>{{ endif }}
-                                       {{ if $nav.contacts }}<li><a class="$nav.contacts.2" href="$nav.contacts.0" title="$nav.contacts.3" >$nav.contacts.1</a></li>{{ endif }}        
-                               </ul>
-                       </li>
-               {{ endif }}
-               
-               {{ if $nav.community }}
-                       <li id="nav-community-link" class="nav-menu $sel.community">
-                               <a class="$nav.community.2" href="$nav.community.0" title="$nav.community.3" >$nav.community.1</a>
-                       </li>
-               {{ endif }}
-               
-               {{ if $nav.network }}
-                       <li id="nav-network-link" class="nav-menu $sel.network">
-                               <a class="$nav.network.2" href="$nav.network.0" title="$nav.network.3" >$nav.network.1</a>
-                               <span id="net-update" class="nav-notify"></span>
-                       </li>
-               {{ endif }}
-               {{ if $nav.home }}
-                       <li id="nav-home-link" class="nav-menu $sel.home">
-                               <a class="$nav.home.2" href="$nav.home.0" title="$nav.home.3" >$nav.home.1</a>
-                               <span id="home-update" class="nav-notify"></span>
-                       </li>
-               {{ endif }}
-               
-               {{ if $nav.notifications }}
-                       <li  id="nav-notifications-linkmenu" class="nav-menu-icon"><a href="$nav.notifications.0" rel="#nav-notifications-menu" title="$nav.notifications.1"><span class="icon s22 notify">$nav.notifications.1</span></a>
-                               <span id="notify-update" class="nav-notify"></span>
-                               <ul id="nav-notifications-menu" class="menu-popup">
-                                       <li id="nav-notifications-mark-all"><a href="#" onclick="notifyMarkAll(); return false;">$nav.notifications.mark.1</a></li>
-                                       <li id="nav-notifications-see-all"><a href="$nav.notifications.all.0">$nav.notifications.all.1</a></li>
-                                       <li class="empty">$emptynotifications</li>
-                               </ul>
-                       </li>           
-               {{ endif }}             
-               
-               <li id="nav-site-linkmenu" class="nav-menu-icon"><a href="#" rel="#nav-site-menu"><span class="icon s22 gear">Site</span></a>
-                       <ul id="nav-site-menu" class="menu-popup">
-                               {{ if $nav.manage }}<li><a class="$nav.manage.2" href="$nav.manage.0" title="$nav.manage.3">$nav.manage.1</a></li>{{ endif }}                           
 
-                               {{ if $nav.settings }}<li><a class="$nav.settings.2" href="$nav.settings.0" title="$nav.settings.3">$nav.settings.1</a></li>{{ endif }}
-                               {{ if $nav.admin }}<li><a class="$nav.admin.2" href="$nav.admin.0" title="$nav.admin.3" >$nav.admin.1</a></li>{{ endif }}
+       {{ if $nav.logout }}<a id="nav-logout-link" class="nav-link $nav.logout.2" href="$nav.logout.0" title="$nav.logout.3" >$nav.logout.1</a> {{ 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> {{ endif }}
 
-                               {{ if $nav.logout }}<li><a class="menu-sep $nav.logout.2" href="$nav.logout.0" title="$nav.logout.3" >$nav.logout.1</a></li>{{ endif }}
-                               {{ if $nav.login }}<li><a class="$nav.login.2" href="$nav.login.0" title="$nav.login.3" >$nav.login.1</a><li>{{ endif }}
-                       </ul>           
-               </li>
-               
-               {{ if $nav.help }} 
-               <li id="nav-help-link" class="nav-menu $sel.help">
-                       <a class="$nav.help.2" target="friendika-help" href="$nav.help.0" title="$nav.help.3" >$nav.help.1</a>
-               </li>
-               {{ endif }}
+       <span id="nav-link-wrapper" >
 
-               <li id="nav-search-link" class="nav-menu $sel.search">
-                       <a class="$nav.search.2" href="$nav.search.0" title="$nav.search.3" >$nav.search.1</a>
-               </li>
-               <li id="nav-directory-link" class="nav-menu $sel.directory">
-                       <a class="$nav.directory.2" href="$nav.directory.0" title="$nav.directory.3" >$nav.directory.1</a>
-               </li>
+       {{ 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 }}
                
-               {{ if $nav.apps }}
-                       <li id="nav-apps-link" class="nav-menu $sel.apps">
-                               <a class=" $nav.apps.2" href="#" rel="#nav-apps-menu" title="$nav.apps.3" >$nav.apps.1</a>
-                               <ul id="nav-apps-menu" class="menu-popup">
-                                       {{ for $apps as $ap }}
-                                       <li>$ap</li>
-                                       {{ endfor }}
-                               </ul>
-                       </li>
-               {{ endif }}
-       </ul>
-
-</nav>
-<ul id="nav-notifications-template" style="display:none;" rel="template">
-       <li><a href="{0}"><img src="{1}">{2} <span class="notif-when">{3}</span></a></li>
-</ul>
+       {{ if $nav.help }} <a id="nav-help-link" class="nav-link $nav.help.2" target="friendika-help" href="$nav.help.0" title="$nav.help.3" >$nav.help.1</a>{{ endif }}
+               
+       {{ if $nav.apps }}<a id="nav-apps-link" class="nav-link $nav.apps.2" href="$nav.apps.0" title="$nav.apps.3" >$nav.apps.1</a>{{ endif }}
 
-{#
+       <a id="nav-search-link" class="nav-link $nav.search.2" href="$nav.search.0" title="$nav.search.3" >$nav.search.1</a>
+       <a id="nav-directory-link" class="nav-link $nav.directory.2" href="$nav.directory.0" title="$nav.directory.3" >$nav.directory.1</a>
 
-{{ if $nav.logout }}<a id="nav-logout-link" class="nav-link $nav.logout.2" href="$nav.logout.0" title="$nav.logout.3" >$nav.logout.1</a> {{ 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> {{ endif }}
+       {{ if $nav.admin }}<a id="nav-admin-link" class="nav-link $nav.admin.2" href="$nav.admin.0" title="$nav.admin.3" >$nav.admin.1</a>{{ endif }}
 
-<span id="nav-link-wrapper" >
+       {{ if $nav.network }}
+       <a id="nav-network-link" class="nav-commlink $nav.network.2 $sel.network" href="$nav.network.0" title="$nav.network.3" >$nav.network.1</a>
+       <span id="net-update" class="nav-ajax-left"></span>
+       {{ endif }}
+       {{ if $nav.home }}
+       <a id="nav-home-link" class="nav-commlink $nav.home.2 $sel.home" href="$nav.home.0" title="$nav.home.3" >$nav.home.1</a>
+       <span id="home-update" class="nav-ajax-left"></span>
+       {{ endif }}
+       {{ if $nav.community }}
+       <a id="nav-community-link" class="nav-commlink $nav.community.2 $sel.community" href="$nav.community.0" title="$nav.community.3" >$nav.community.1</a>
+       {{ endif }}
+       {{ if $nav.introductions }}
+       <a id="nav-notify-link" class="nav-commlink $nav.introductions.2 $sel.introductions" href="$nav.introductions.0" title="$nav.introductions.3" >$nav.introductions.1</a>
+       <span id="intro-update" class="nav-ajax-left"></span>
+       {{ endif }}
+       {{ if $nav.messages }}
+       <a id="nav-messages-link" class="nav-commlink $nav.messages.2 $sel.messages" href="$nav.messages.0" title="$nav.messages.3" >$nav.messages.1</a>
+       <span id="mail-update" class="nav-ajax-left"></span>
+       {{ endif }}
 
-{{ if $nav.register }}<a id="nav-register-link" class="nav-commlink $nav.register.2" href="$nav.register.0" title="$nav.register.3" >$nav.register.1</a>{{ endif }}
-       
-<a id="nav-help-link" class="nav-link $nav.help.2" target="friendika-help" href="$nav.help.0" title="$nav.help.3" >$nav.help.1</a>
-       
-{{ if $nav.apps }}<a id="nav-apps-link" class="nav-link $nav.apps.2" href="$nav.apps.0" title="$nav.apps.3" >$nav.apps.1</a>{{ endif }}
 
-<a id="nav-search-link" class="nav-link $nav.search.2" href="$nav.search.0" title="$nav.search.3" >$nav.search.1</a>
-<a id="nav-directory-link" class="nav-link $nav.directory.2" href="$nav.directory.0" title="$nav.directory.3" >$nav.directory.1</a>
 
-{{ if $nav.admin }}<a id="nav-admin-link" class="nav-link $nav.admin.2" href="$nav.admin.0" title="$nav.admin.3" >$nav.admin.1</a>{{ endif }}
+       {{ if $nav.manage }}<a id="nav-manage-link" class="nav-commlink $nav.manage.2 $sel.manage" href="$nav.manage.0" title="$nav.manage.3">$nav.manage.1</a>{{ endif }}
 
-{{ if $nav.notifications }}
-<a id="nav-notify-link" class="nav-commlink $nav.notifications.2" href="$nav.notifications.0" title="$nav.notifications.3" >$nav.notifications.1</a>
-<span id="notify-update" class="nav-ajax-left"></span>
-{{ endif }}
-{{ if $nav.messages }}
-<a id="nav-messages-link" class="nav-commlink $nav.messages.2" href="$nav.messages.0" title="$nav.messages.3" >$nav.messages.1</a>
-<span id="mail-update" class="nav-ajax-left"></span>
-{{ endif }}
 
-{{ if $nav.manage }}<a id="nav-manage-link" class="nav-commlink $nav.manage.2" href="$nav.manage.0" title="$nav.manage.3">$nav.manage.1</a>{{ endif }}
+               {{ if $nav.notifications }}
+                       <a id="nav-notifications-linkmenu" class="nav-commlink" href="$nav.notifications.0" rel="#nav-notifications-menu" title="$nav.notifications.1">$nav.notifications.1</a>
+                               <span id="notify-update" class="nav-ajax-left"></span>
+                               <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.settings }}<a id="nav-settings-link" class="nav-link $nav.settings.2" href="$nav.settings.0" title="$nav.settings.3">$nav.settings.1</a>{{ endif }}
-{{ if $nav.profiles }}<a id="nav-profiles-link" class="nav-link $nav.profiles.2" href="$nav.profiles.0" title="$nav.profiles.3" >$nav.profiles.1</a>{{ endif }}
+       {{ if $nav.settings }}<a id="nav-settings-link" class="nav-link $nav.settings.2" href="$nav.settings.0" title="$nav.settings.3">$nav.settings.1</a>{{ endif }}
+       {{ if $nav.profiles }}<a id="nav-profiles-link" class="nav-link $nav.profiles.2" href="$nav.profiles.0" title="$nav.profiles.3" >$nav.profiles.1</a>{{ endif }}
 
+       {{ if $nav.contacts }}<a id="nav-contacts-link" class="nav-link $nav.contacts.2" href="$nav.contacts.0" title="$nav.contacts.3" >$nav.contacts.1</a>{{ endif }}
+       </span>
+       <span id="nav-end"></span>
+       <span id="banner">$banner</span>
+</nav>
 
-</span>
-<span id="nav-end"></span>
-<span id="banner">$banner</span>
-#}
+<ul id="nav-notifications-template" style="display:none;" rel="template">
+       <li class="{4}"><a href="{0}"><img src="{1}" height="24" width="24" alt="" />{2} <span class="notif-when">{3}</span></a></li>
+</ul>
index cbadf1361b247bdd58b2a9614e11bad647ef075b..b0cb8890c546c228654d791c97bc3e77e2faf747 100755 (executable)
@@ -1,12 +1,10 @@
 <div id="nets-sidebar" class="widget">
        <h3>$title</h3>
        <div id="nets-desc">$desc</div>
-       
+       <a href="$base" class="nets-link{{ if $sel_all }} nets-selected{{ endif }} nets-all">$all</a>
        <ul class="nets-ul">
-               <li class="tool {{ if $sel_all }}selected{{ endif }}"><a href="$base" class="nets-link nets-all">$all</a>
-               {{ for $nets as $net }}
-                       <li class="tool {{ if $net.selected }}selected{{ endif }}"><a href="$base?f=&nets=$net.ref" class="nets-link">$net.name</a></li>
-               {{ endfor }}
+       {{ for $nets as $net }}
+       <li><a href="$base?nets=$net.ref" class="nets-link{{ if $net.selected }} nets-selected{{ endif }}">$net.name</a></li>
+       {{ endfor }}
        </ul>
-       
 </div>
index 7cd02f16486eb38ea54f5bbe54408fc1982936ef..154f22363ce6118ce3c80c104a449d4024b503d1 100755 (executable)
@@ -1,27 +1,11 @@
 <div class="vcard">
 
-       <div class="tool">
-               <div class="fn label">$profile.name</div>
-               {{ if $profile.edit }}
-                       <div class="action">
-                       <a class="icon s16 edit ttright" href="#" rel="#profiles-menu" title="$profile.edit.3"><span>$profile.edit.1</span></a>
-                       <ul id="profiles-menu" class="menu-popup">
-                               {{ for $profile.menu.entries as $e }}
-                               <li>
-                                       <a href="profiles/$e.id"><img src='$e.photo'>$e.profile_name</a>
-                               </li>
-                               {{ endfor }}
-                               <li><a href="profile_photo" >$profile.menu.chg_photo</a></li>
-                               <li><a href="profiles/new" id="profile-listing-new-link">$profile.menu.cr_new</a></li>
+       <div class="fn label">$profile.name</div>
+       
                                
-                       </ul>
-                       </div>
-               {{ endif }}
-       </div>
-
-
+       
        {{ if $pdesc }}<div class="title">$profile.pdesc</div>{{ endif }}
-       <div id="profile-photo-wrapper"><img class="photo" width="175" height="175" src="$profile.photo?rev=$profile.picdate" alt="$profile.name" /></div>
+       <div id="profile-photo-wrapper"><img class="photo" width="175" height="175" src="$profile.photo?rev=$profile.picdate" alt="$profile.name"></div>
 
 
 
index 9c10a26decb429c5dc63c6516af253b2df327c01..e6a0d6278d696589ae07e37e3b8c9d9569448053 100755 (executable)
@@ -1,15 +1,14 @@
-<div id="saved-search-list" class="widget">
-       <h3 class="title">$title</h3>
-
+<div class="widget" id="saved-search-list">
+       <h3 id="search">$title</h3>
+       $searchbox
+       
        <ul id="saved-search-ul">
                {{ for $saved as $search }}
-                       <li class="tool {{if $search.selected}}selected{{endif}}">
-                                       <a href="network/?f=&search=$search.encodedterm" class="label" >$search.term</a>
-                                       <a href="network/?f=&remove=1&search=$search.encodedterm" class="action icon s10 delete" title="$search.delete" onclick="return confirmDelete();"></a>
-                       </li>
+               <li class="saved-search-li clear">
+                       <a title="$search.delete" onclick="return confirmDelete();" id="drop-saved-search-term-$search.id" class="iconspacer savedsearchdrop " href="network/?f=&amp;remove=1&amp;search=$search.encodedterm"></a>
+                       <a id="saved-search-term-$search.id" class="savedsearchterm" href="network/?f=&amp;search=$search.encodedterm">$search.term</a>
+               </li>
                {{ endfor }}
        </ul>
-       
-       $searchbox
-       
+       <div class="clear"></div>
 </div>
index 80d6678fb3589747e3d9037d1d788373f10be4d2..bfad1b7b72e8871b48b172728444ca7b3d6d079f 100755 (executable)
@@ -1,91 +1,54 @@
-
-<div class="wall-item-decor">
-       <span class="icon s22 star $item.isstarred" id="starred-$item.id" title="$item.star.starred">$item.star.starred</span>
-       {{ if $item.lock }}<span class="icon s22 lock fakelink" onclick="lockview(event,$item.id);" title="$item.lock">$item.lock</span>{{ endif }}     
-       <img id="like-rotator-$item.id" class="like-rotator" src="images/rotator.gif" alt="$item.wait" title="$item.wait" style="display: none;" />
-</div>
-
-<div class="wall-item-container $item.indent">
-       <div class="wall-item-item">
-               <div class="wall-item-info">
-                       <div class="contact-photo-wrapper"
-                               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-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" 
+                                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="contact-photo$item.sparkle" id="wall-item-photo-$item.id" alt="$item.name" />
-                               </a>
-                               <a href="#" rel="#wall-item-photo-menu-$item.id" class="contact-photo-menu-button icon s16 menu" id="wall-item-photo-menu-button-$item.id">menu</a>
-                               <ul class="wall-item-menu menu-popup" id="wall-item-photo-menu-$item.id">
-                               $item.item_photo_menu
-                               </ul>
-                               
+                               <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>
+                                               $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 class="wall-item-location">$item.location</div>    
-               </div>
-               <div class="wall-item-content">
-                       {{ if $item.title }}<h2><a href="$item.plink.href">$item.title</a></h2>{{ endif }}
-                       $item.body
-               </div>
-       </div>
-       <div class="wall-item-bottom">
-               <div class="wall-item-links">
-               </div>
-               <div class="wall-item-tags">
-                       {{ for $item.tags as $tag }}
-                               <span class='tag'>$tag</span>
-                       {{ endfor }}
                </div>
-       </div>
-       <div class="wall-item-bottom">
-               <div class="">
-                       {{ if $item.plink }}<a class="icon s16 link" title="$item.plink.title" href="$item.plink.href">$item.plink.title</a>{{ endif }}
+               <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 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>
                </div>
-               <div class="wall-item-actions">
-                       <div class="wall-item-actions-author">
-                               <a href="$item.profile_url" target="redir" title="$item.linktitle" class="wall-item-name-link"><span class="wall-item-name$item.sparkle">$item.name</span></a> <span class="wall-item-ago">$item.ago</span>
-                       </div>
-                       
-                       <div class="wall-item-actions-social">
-                       {{ if $item.star }}
-                               <a href="#" id="star-$item.id" onclick="dostar($item.id); return false;"  class="$item.star.classdo"  title="$item.star.do">$item.star.do</a>
-                               <a href="#" id="unstar-$item.id" onclick="dostar($item.id); return false;"  class="$item.star.classundo"  title="$item.star.undo">$item.star.undo</a>
-                               <a href="#" id="tagger-$item.id" onclick="itemTag($item.id); return false;" class="$item.star.classtagger" title="$item.star.tagger">$item.star.tagger</a>
-                       {{ endif }}
-                       
-                       {{ if $item.vote }}
-                               <a href="#" id="like-$item.id" title="$item.vote.like.0" onclick="dolike($item.id,'like'); return false">$item.vote.like.1</a>
-                               <a href="#" id="dislike-$item.id" title="$item.vote.dislike.0" onclick="dolike($item.id,'dislike'); return false">$item.vote.dislike.1</a>
-                       {{ endif }}
-                                               
-                       {{ if $item.vote.share }}
-                               <a href="#" id="share-$item.id" title="$item.vote.share.0" onclick="jotShare($item.id); return false">$item.vote.share.1</a>
-                       {{ endif }}                     
+               <div class="wall-item-tools" id="wall-item-tools-$item.id">
+                       <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-actions-tools">
-
-                               {{ if $item.drop.dropping }}
-                                       <input type="checkbox" title="$item.drop.select" name="itemselected[]" class="item-select" value="$item.id" />
-                                       <a href="item/drop/$item.id" onclick="return confirmDelete();" class="icon delete s16" title="$item.drop.delete">$item.drop.delete</a>
-                               {{ endif }}
-                               {{ if $item.edpost }}
-                                       <a class="icon edit s16" href="$item.edpost.0" title="$item.edpost.1"></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-bottom">
-               <div class="wall-item-links"></div>
-               <div class="wall-item-like" id="wall-item-like-$item.id">$item.like</div>
-               <div class="wall-item-dislike" id="wall-item-dislike-$item.id">$item.dislike</div>
-               {{ if $item.conv }}
-               <div class="wall-item-conv" id="wall-item-conv-$item.id" >
+       <div class="wall-item-wrapper-end"></div>
+
+
+       <div class="wall-item-conv" id="wall-item-conv-$item.id" >
+       {{ if $item.conv }}
                        <a href='$item.conv.href' id='context-$item.id' title='$item.conv.title'>$item.conv.title</a>
-               {{ endif }}
-               </div>
+       {{ endif }}
        </div>
-       
-       
+
+<div class="wall-item-outside-wrapper-end$item.indent" ></div>
+
 </div>
 
+
diff --git a/view/theme/duepuntozero/comment_item.tpl b/view/theme/duepuntozero/comment_item.tpl
deleted file mode 100755 (executable)
index 3503c38..0000000
+++ /dev/null
@@ -1,32 +0,0 @@
-               <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>
-                               <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-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/duepuntozero/contact_template.tpl b/view/theme/duepuntozero/contact_template.tpl
deleted file mode 100755 (executable)
index 48930b4..0000000
+++ /dev/null
@@ -1,25 +0,0 @@
-
-<div class="contact-entry-wrapper" id="contact-entry-wrapper-$contact.id" >
-       <div class="contact-entry-photo-wrapper" >
-               <div class="contact-entry-photo mframe" id="contact-entry-photo-$contact.id"
-               onmouseover="if (typeof t$contact.id != 'undefined') clearTimeout(t$contact.id); openMenu('contact-photo-menu-button-$contact.id')" 
-               onmouseout="t$contact.id=setTimeout('closeMenu(\'contact-photo-menu-button-$contact.id\'); closeMenu(\'contact-photo-menu-$contact.id\');',200)" >
-
-                       <a href="$contact.url" title="$contact.img_hover" /><img src="$contact.thumb" $contact.sparkle alt="$contact.name" /></a>
-
-                       {{ if $contact.photo_menu }}
-                       <span onclick="openClose('contact-photo-menu-$contact.id');" class="fakelink contact-photo-menu-button" id="contact-photo-menu-button-$contact.id">menu</span>
-                <div class="contact-photo-menu" id="contact-photo-menu-$contact.id">
-                    <ul>
-                        $contact.photo_menu
-                    </ul>
-                </div>
-                       {{ endif }}
-               </div>
-                       
-       </div>
-       <div class="contact-entry-photo-end" ></div>
-               <div class="contact-entry-name" id="contact-entry-name-$contact.id" >$contact.name</div>
-
-       <div class="contact-entry-end" ></div>
-</div>
diff --git a/view/theme/duepuntozero/conversation.tpl b/view/theme/duepuntozero/conversation.tpl
deleted file mode 100755 (executable)
index 43bb1dd..0000000
+++ /dev/null
@@ -1,25 +0,0 @@
-{{ for $threads as $thread }}
-<div id="tread-wrapper-$thread.id" class="tread-wrapper">
-       {{ for $thread.items as $item }}
-               {{if $item.comment_firstcollapsed}}
-                       <div class="hide-comments-outer">
-                       <span id="hide-comments-total-$thread.id" class="hide-comments-total">$thread.num_comments</span> <span id="hide-comments-$thread.id" class="hide-comments fakelink" onclick="showHideComments($thread.id);">$thread.hide_text</span>
-                       </div>
-                       <div id="collapsed-comments-$thread.id" class="collapsed-comments" style="display: none;">
-               {{endif}}
-               {{if $item.comment_lastcollapsed}}</div>{{endif}}
-               
-               {{ inc $item.template }}{{ endinc }}
-               
-               
-       {{ endfor }}
-</div>
-{{ endfor }}
-
-{{ if $dropping }}
-<div id="item-delete-selected" class="fakelink" onclick="deleteCheckedItems();">
-  <div id="item-delete-selected-icon" class="icon drophide" title="$dropping" onmouseover="imgbright(this);" onmouseout="imgdull(this);" ></div>
-  <div id="item-delete-selected-desc" >$dropping</div>
-</div>
-<div id="item-delete-selected-end"></div>
-{{ endif }}
diff --git a/view/theme/duepuntozero/group_side.tpl b/view/theme/duepuntozero/group_side.tpl
deleted file mode 100755 (executable)
index 0353b1d..0000000
+++ /dev/null
@@ -1,28 +0,0 @@
-<div class="widget" id="group-sidebar">
-<h3>$title</h3>
-
-<div id="sidebar-group-list">
-       <ul id="sidebar-group-ul">
-               {{ for $groups as $group }}
-                       <li class="sidebar-group-li">
-                               {{ if $group.cid }}
-                                       <input type="checkbox" 
-                                               class="{{ if $group.selected }}ticked{{ else }}unticked {{ endif }} action" 
-                                               onclick="contactgroupChangeMember('$group.id','$group.cid');return true;"
-                                               {{ if $group.ismember }}checked="checked"{{ endif }}
-                                       />
-                               {{ endif }}                     
-                               {{ if $group.edit }}
-                                       <a class="groupsideedit" href="$group.edit.href" title="$edittext"><span id="edit-sidebar-group-element-$group.id" class="group-edit-icon iconspacer small-pencil"></span></a>
-                               {{ endif }}
-                               <a id="sidebar-group-element-$group.id" class="sidebar-group-element {{ if $group.selected }}group-selected{{ endif }}" href="$group.href">$group.text</a>
-                       </li>
-               {{ endfor }}
-       </ul>
-       </div>
-  <div id="sidebar-new-group">
-  <a href="group/new">$createtext</a>
-  </div>
-</div>
-
-
diff --git a/view/theme/duepuntozero/jot.tpl b/view/theme/duepuntozero/jot.tpl
deleted file mode 100755 (executable)
index 5fe1f95..0000000
+++ /dev/null
@@ -1,84 +0,0 @@
-
-<div id="profile-jot-wrapper" >
-       <div id="profile-jot-banner-wrapper">
-               <div id="profile-jot-desc" >&nbsp;</div>
-               <div id="character-counter" class="grey"></div>
-       </div>
-       <div id="profile-jot-banner-end"></div>
-
-       <form id="profile-jot-form" action="$action" method="post" >
-               <input type="hidden" name="type" value="$ptyp" />
-               <input type="hidden" name="profile_uid" value="$profile_uid" />
-               <input type="hidden" name="return" value="$return_path" />
-               <input type="hidden" name="location" id="jot-location" value="$defloc" />
-               <input type="hidden" name="coord" id="jot-coord" value="" />
-               <input type="hidden" name="post_id" value="$post_id" />
-               <input type="hidden" name="preview" id="jot-preview" value="0" />
-               <div id="jot-title-wrap"><input name="title" id="jot-title" type="text" placeholder="$placeholdertitle" value="$title" class="jothidden" style="display:none"></div>
-               <div id="jot-text-wrap">
-               <img id="profile-jot-text-loading" src="images/rotator.gif" alt="$wait" title="$wait" style="display: none;" />
-               <textarea rows="5" cols="64" class="profile-jot-text" id="profile-jot-text" name="body" >{{ if $content }}$content{{ else }}$share{{ endif }}</textarea>
-               </div>
-
-<div id="profile-jot-submit-wrapper" class="jothidden">
-       <input type="submit" id="profile-jot-submit" name="submit" value="$share" />
-
-       <div id="profile-upload-wrapper" style="display: $visitor;" >
-               <div id="wall-image-upload-div" ><a href="#" onclick="return false;" id="wall-image-upload" class="icon camera" title="$upload"></a></div>
-       </div> 
-       <div id="profile-attach-wrapper" style="display: $visitor;" >
-               <div id="wall-file-upload-div" ><a href="#" onclick="return false;" id="wall-file-upload" class="icon attach" title="$attach"></a></div>
-       </div> 
-
-       <div id="profile-link-wrapper" style="display: $visitor;" ondragenter="linkdropper(event);" ondragover="linkdropper(event);" ondrop="linkdrop(event);" >
-               <a id="profile-link" class="icon link" title="$weblink" ondragenter="return linkdropper(event);" ondragover="return linkdropper(event);" ondrop="linkdrop(event);" onclick="jotGetLink(); return false;"></a>
-       </div> 
-       <div id="profile-video-wrapper" style="display: $visitor;" >
-               <a id="profile-video" class="icon video" title="$video" onclick="jotVideoURL();return false;"></a>
-       </div> 
-       <div id="profile-audio-wrapper" style="display: $visitor;" >
-               <a id="profile-audio" class="icon audio" title="$audio" onclick="jotAudioURL();return false;"></a>
-       </div> 
-       <div id="profile-location-wrapper" style="display: $visitor;" >
-               <a id="profile-location" class="icon globe" title="$setloc" onclick="jotGetLocation();return false;"></a>
-       </div> 
-       <div id="profile-nolocation-wrapper" style="display: none;" >
-               <a id="profile-nolocation" class="icon noglobe" title="$noloc" onclick="jotClearLocation();return false;"></a>
-       </div> 
-
-       <div id="profile-jot-perms" class="profile-jot-perms" style="display: $pvisit;" >
-               <a href="#profile-jot-acl-wrapper" id="jot-perms-icon" class="icon $lockstate"  title="$permset" ></a>$bang
-       </div>
-
-       <span onclick="preview_post();" id="jot-preview-link" class="fakelink">$preview</span>
-
-       <div id="profile-jot-perms-end"></div>
-
-
-       <div id="profile-jot-plugin-wrapper">
-       $jotplugins
-       </div>
-
-       <div id="profile-rotator-wrapper" style="display: $visitor;" >
-               <img id="profile-rotator" src="images/rotator.gif" alt="$wait" title="$wait" style="display: none;" />
-       </div> 
-       
-       <div id="jot-preview-content" style="display:none;"></div>
-
-       <div style="display: none;">
-               <div id="profile-jot-acl-wrapper" style="width:auto;height:auto;overflow:auto;">
-                       $acl
-                       <hr style="clear:both"/>
-                       <div id="profile-jot-email-label">$emailcc</div><input type="text" name="emailcc" id="profile-jot-email" title="$emtitle" />
-                       <div id="profile-jot-email-end"></div>
-                       $jotnets
-               </div>
-       </div>
-
-
-</div>
-
-<div id="profile-jot-end"></div>
-</form>
-</div>
-               {{ if $content }}<script>initEditor();</script>{{ endif }}
diff --git a/view/theme/duepuntozero/nav.tpl b/view/theme/duepuntozero/nav.tpl
deleted file mode 100755 (executable)
index 4675c3e..0000000
+++ /dev/null
@@ -1,68 +0,0 @@
-<nav>
-       $langselector
-
-       <div id="site-location">$sitelocation</div>
-
-       {{ if $nav.logout }}<a id="nav-logout-link" class="nav-link $nav.logout.2" href="$nav.logout.0" title="$nav.logout.3" >$nav.logout.1</a> {{ 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> {{ endif }}
-
-       <span id="nav-link-wrapper" >
-
-       {{ 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 }}
-               
-       {{ if $nav.help }} <a id="nav-help-link" class="nav-link $nav.help.2" target="friendika-help" href="$nav.help.0" title="$nav.help.3" >$nav.help.1</a>{{ endif }}
-               
-       {{ if $nav.apps }}<a id="nav-apps-link" class="nav-link $nav.apps.2" href="$nav.apps.0" title="$nav.apps.3" >$nav.apps.1</a>{{ endif }}
-
-       <a id="nav-search-link" class="nav-link $nav.search.2" href="$nav.search.0" title="$nav.search.3" >$nav.search.1</a>
-       <a id="nav-directory-link" class="nav-link $nav.directory.2" href="$nav.directory.0" title="$nav.directory.3" >$nav.directory.1</a>
-
-       {{ if $nav.admin }}<a id="nav-admin-link" class="nav-link $nav.admin.2" href="$nav.admin.0" title="$nav.admin.3" >$nav.admin.1</a>{{ endif }}
-
-       {{ if $nav.network }}
-       <a id="nav-network-link" class="nav-commlink $nav.network.2 $sel.network" href="$nav.network.0" title="$nav.network.3" >$nav.network.1</a>
-       <span id="net-update" class="nav-ajax-left"></span>
-       {{ endif }}
-       {{ if $nav.home }}
-       <a id="nav-home-link" class="nav-commlink $nav.home.2 $sel.home" href="$nav.home.0" title="$nav.home.3" >$nav.home.1</a>
-       <span id="home-update" class="nav-ajax-left"></span>
-       {{ endif }}
-       {{ if $nav.community }}
-       <a id="nav-community-link" class="nav-commlink $nav.community.2 $sel.community" href="$nav.community.0" title="$nav.community.3" >$nav.community.1</a>
-       {{ endif }}
-       {{ if $nav.introductions }}
-       <a id="nav-notify-link" class="nav-commlink $nav.introductions.2 $sel.introductions" href="$nav.introductions.0" title="$nav.introductions.3" >$nav.introductions.1</a>
-       <span id="intro-update" class="nav-ajax-left"></span>
-       {{ endif }}
-       {{ if $nav.messages }}
-       <a id="nav-messages-link" class="nav-commlink $nav.messages.2 $sel.messages" href="$nav.messages.0" title="$nav.messages.3" >$nav.messages.1</a>
-       <span id="mail-update" class="nav-ajax-left"></span>
-       {{ endif }}
-
-
-
-       {{ if $nav.manage }}<a id="nav-manage-link" class="nav-commlink $nav.manage.2 $sel.manage" href="$nav.manage.0" title="$nav.manage.3">$nav.manage.1</a>{{ endif }}
-
-
-               {{ if $nav.notifications }}
-                       <a id="nav-notifications-linkmenu" class="nav-commlink" href="$nav.notifications.0" rel="#nav-notifications-menu" title="$nav.notifications.1">$nav.notifications.1</a>
-                               <span id="notify-update" class="nav-ajax-left"></span>
-                               <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.settings }}<a id="nav-settings-link" class="nav-link $nav.settings.2" href="$nav.settings.0" title="$nav.settings.3">$nav.settings.1</a>{{ endif }}
-       {{ if $nav.profiles }}<a id="nav-profiles-link" class="nav-link $nav.profiles.2" href="$nav.profiles.0" title="$nav.profiles.3" >$nav.profiles.1</a>{{ endif }}
-
-       {{ if $nav.contacts }}<a id="nav-contacts-link" class="nav-link $nav.contacts.2" href="$nav.contacts.0" title="$nav.contacts.3" >$nav.contacts.1</a>{{ endif }}
-       </span>
-       <span id="nav-end"></span>
-       <span id="banner">$banner</span>
-</nav>
-
-<ul id="nav-notifications-template" style="display:none;" rel="template">
-       <li class="{4}"><a href="{0}"><img src="{1}" height="24" width="24" alt="" />{2} <span class="notif-when">{3}</span></a></li>
-</ul>
diff --git a/view/theme/duepuntozero/nets.tpl b/view/theme/duepuntozero/nets.tpl
deleted file mode 100755 (executable)
index b0cb889..0000000
+++ /dev/null
@@ -1,10 +0,0 @@
-<div id="nets-sidebar" class="widget">
-       <h3>$title</h3>
-       <div id="nets-desc">$desc</div>
-       <a href="$base" class="nets-link{{ if $sel_all }} nets-selected{{ endif }} nets-all">$all</a>
-       <ul class="nets-ul">
-       {{ for $nets as $net }}
-       <li><a href="$base?nets=$net.ref" class="nets-link{{ if $net.selected }} nets-selected{{ endif }}">$net.name</a></li>
-       {{ endfor }}
-       </ul>
-</div>
diff --git a/view/theme/duepuntozero/profile_vcard.tpl b/view/theme/duepuntozero/profile_vcard.tpl
deleted file mode 100755 (executable)
index 154f223..0000000
+++ /dev/null
@@ -1,47 +0,0 @@
-<div class="vcard">
-
-       <div class="fn label">$profile.name</div>
-       
-                               
-       
-       {{ if $pdesc }}<div class="title">$profile.pdesc</div>{{ endif }}
-       <div id="profile-photo-wrapper"><img class="photo" width="175" height="175" src="$profile.photo?rev=$profile.picdate" alt="$profile.name"></div>
-
-
-
-       {{ if $location }}
-               <dl class="location"><dt class="location-label">$location</dt> 
-               <dd class="adr">
-                       {{ if $profile.address }}<div class="street-address">$profile.address</div>{{ endif }}
-                       <span class="city-state-zip">
-                               <span class="locality">$profile.locality</span>{{ if $profile.locality }}, {{ endif }}
-                               <span class="region">$profile.region</span>
-                               <span class="postal-code">$profile.postal-code</span>
-                       </span>
-                       {{ if $profile.country-name }}<span class="country-name">$profile.country-name</span>{{ endif }}
-               </dd>
-               </dl>
-       {{ endif }}
-
-       {{ if $gender }}<dl class="mf"><dt class="gender-label">$gender</dt> <dd class="x-gender">$profile.gender</dd></dl>{{ endif }}
-       
-       {{ if $profile.pubkey }}<div class="key" style="display:none;">$profile.pubkey</div>{{ endif }}
-
-       {{ if $marital }}<dl class="marital"><dt class="marital-label"><span class="heart">&hearts;</span>$marital</dt><dd class="marital-text">$profile.marital</dd></dl>{{ endif }}
-
-       {{ if $homepage }}<dl class="homepage"><dt class="homepage-label">$homepage</dt><dd class="homepage-url"><a href="$profile.homepage" target="external-link">$profile.homepage</a></dd></dl>{{ endif }}
-
-       {{ inc diaspora_vcard.tpl }}{{ endinc }}
-       
-       <div id="profile-extra-links">
-               <ul>
-                       {{ if $connect }}
-                               <li><a id="dfrn-request-link" href="dfrn_request/$profile.nickname">$connect</a></li>
-                       {{ endif }}
-               </ul>
-       </div>
-</div>
-
-$contact_block
-
-
diff --git a/view/theme/duepuntozero/saved_searches_aside.tpl b/view/theme/duepuntozero/saved_searches_aside.tpl
deleted file mode 100755 (executable)
index e6a0d62..0000000
+++ /dev/null
@@ -1,14 +0,0 @@
-<div class="widget" id="saved-search-list">
-       <h3 id="search">$title</h3>
-       $searchbox
-       
-       <ul id="saved-search-ul">
-               {{ for $saved as $search }}
-               <li class="saved-search-li clear">
-                       <a title="$search.delete" onclick="return confirmDelete();" id="drop-saved-search-term-$search.id" class="iconspacer savedsearchdrop " href="network/?f=&amp;remove=1&amp;search=$search.encodedterm"></a>
-                       <a id="saved-search-term-$search.id" class="savedsearchterm" href="network/?f=&amp;search=$search.encodedterm">$search.term</a>
-               </li>
-               {{ endfor }}
-       </ul>
-       <div class="clear"></div>
-</div>
diff --git a/view/theme/duepuntozero/search_item.tpl b/view/theme/duepuntozero/search_item.tpl
deleted file mode 100755 (executable)
index bfad1b7..0000000
+++ /dev/null
@@ -1,54 +0,0 @@
-<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" 
-                                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>
-                                               $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>
-                               <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>
-               </div>
-               <div class="wall-item-tools" id="wall-item-tools-$item.id">
-                       <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>
-                               {{ 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-conv" id="wall-item-conv-$item.id" >
-       {{ if $item.conv }}
-                       <a href='$item.conv.href' id='context-$item.id' title='$item.conv.title'>$item.conv.title</a>
-       {{ endif }}
-       </div>
-
-<div class="wall-item-outside-wrapper-end$item.indent" ></div>
-
-</div>
-
-
diff --git a/view/theme/duepuntozero/wall_item.tpl b/view/theme/duepuntozero/wall_item.tpl
deleted file mode 100755 (executable)
index 9d1dd7d..0000000
+++ /dev/null
@@ -1,78 +0,0 @@
-<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" 
-                                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>
-                                               $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>
-                               <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='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="icon remote-link"></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="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" id="wall-item-like-$item.id">$item.like</div>
-       <div class="wall-item-dislike" id="wall-item-dislike-$item.id">$item.dislike</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/duepuntozero/wallwall_item.tpl b/view/theme/duepuntozero/wallwall_item.tpl
deleted file mode 100755 (executable)
index bad5680..0000000
+++ /dev/null
@@ -1,85 +0,0 @@
-<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>
-                        $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='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="icon remote-link"></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="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" id="wall-item-like-$item.id">$item.like</div>
-       <div class="wall-item-dislike" 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/quattro/comment_item.tpl b/view/theme/quattro/comment_item.tpl
new file mode 100755 (executable)
index 0000000..cde4ca3
--- /dev/null
@@ -0,0 +1,32 @@
+               <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>
+                               {{ if $qcomment }}
+                               {{ for $qcomment as $qc }}                              
+                                       <span class="fakelink qcomment" onclick="commentInsert(this,$id); return false;" >$qc</span>
+                                       &nbsp;
+                               {{ endfor }}
+                               {{ endif }}
+                               <textarea id="comment-edit-text-$id" class="comment-edit-text-empty" name="body" onFocus="commentOpen(this,$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/quattro/contact_template.tpl b/view/theme/quattro/contact_template.tpl
new file mode 100755 (executable)
index 0000000..b826acc
--- /dev/null
@@ -0,0 +1,26 @@
+
+<div class="contact-wrapper" id="contact-entry-wrapper-$id" >
+       <div class="contact-photo-wrapper" >
+               <div class="contact-photo mframe" id="contact-entry-photo-$contact.id"
+               onmouseover="if (typeof t$contact.id != 'undefined') clearTimeout(t$contact.id); openMenu('contact-photo-menu-button-$contact.id')" 
+               onmouseout="t$contact.id=setTimeout('closeMenu(\'contact-photo-menu-button-$contact.id\'); closeMenu(\'contact-photo-menu-$contact.id\');',200)" >
+
+                       <a href="$contact.url" title="$contact.img_hover" /><img src="$contact.thumb" $contact.sparkle alt="$contact.name" /></a>
+
+                       {{ if $contact.photo_menu }}
+                       <a href="#" rel="#contact-photo-menu-$contact.id" class="contact-photo-menu-button icon s16 menu" id="contact-photo-menu-button-$contact.id">menu</a>
+                       <ul class="contact-photo-menu menu-popup" id="contact-photo-menu-$contact.id">
+                               $contact.photo_menu
+                       </ul>
+                       {{ endif }}
+               </div>
+                       
+       </div>
+       <div class="contact-name" id="contact-entry-name-$contact.id" >$contact.name</div>
+       {{ if $contact.alt_text }}<div class="contact-details" id="contact-entry-rel-$contact.id" >$contact.alt_text</div>{{ endif }}
+       <div class="contact-details" id="contact-entry-url-$contact.id" >$contact.itemurl</div>
+       <div class="contact-details" id="contact-entry-network-$contact.id" >$contact.network</div>
+
+
+</div>
+
diff --git a/view/theme/quattro/conversation.tpl b/view/theme/quattro/conversation.tpl
new file mode 100755 (executable)
index 0000000..ff202bb
--- /dev/null
@@ -0,0 +1,23 @@
+{{ for $threads as $thread }}
+<div id="tread-wrapper-$thread.id" class="tread-wrapper">
+       {{ for $thread.items as $item }}
+               {{if $item.comment_firstcollapsed}}
+                       <div class="hide-comments-outer">
+                       <span id="hide-comments-total-$thread.id" class="hide-comments-total">$thread.num_comments</span> <span id="hide-comments-$thread.id" class="hide-comments fakelink" onclick="showHideComments($thread.id);">$thread.hide_text</span>
+                       </div>
+                       <div id="collapsed-comments-$thread.id" class="collapsed-comments" style="display: none;">
+               {{endif}}
+               {{if $item.comment_lastcollapsed}}</div>{{endif}}
+               
+               {{ inc $item.template }}{{ endinc }}
+               
+               
+       {{ endfor }}
+</div>
+{{ endfor }}
+
+{{ if $dropping }}
+<a href="#" onclick="deleteCheckedItems();return false;">
+       <span class="icon s22 delete text">$dropping</span>
+</a>
+{{ endif }}
diff --git a/view/theme/quattro/group_side.tpl b/view/theme/quattro/group_side.tpl
new file mode 100755 (executable)
index 0000000..596a8d1
--- /dev/null
@@ -0,0 +1,29 @@
+<div id="group-sidebar" class="widget">
+       <div class="title tool">
+               <h3 class="label">$title</h3>
+               <a href="group/new" title="$createtext" class="action"><span class="icon text s16 add"> $add</span></a>
+       </div>
+
+       <div id="sidebar-group-list">
+               <ul>
+                       {{ for $groups as $group }}
+                       <li class="tool  {{ if $group.selected }}selected{{ endif }}">
+                               <a href="$group.href" class="label">
+                                       $group.text
+                               </a>
+                               {{ if $group.edit }}
+                                       <a href="$group.edit.href" class="action"><span class="icon text s10 edit">$group.edit.title</span></a>
+                               {{ endif }}
+                               {{ if $group.cid }}
+                                       <input type="checkbox" 
+                                               class="{{ if $group.selected }}ticked{{ else }}unticked {{ endif }} action" 
+                                               onclick="contactgroupChangeMember('$group.id','$group.cid');return true;"
+                                               {{ if $group.ismember }}checked="checked"{{ endif }}
+                                       />
+                               {{ endif }}
+                       </li>
+                       {{ endfor }}
+               </ul>
+       </div>
+</div> 
+
diff --git a/view/theme/quattro/jot.tpl b/view/theme/quattro/jot.tpl
new file mode 100755 (executable)
index 0000000..2f89d43
--- /dev/null
@@ -0,0 +1,48 @@
+<form id="profile-jot-form" action="$action" method="post">
+       <div id="jot">
+               <div id="profile-jot-desc" class="jothidden">&nbsp;</div>
+               <input name="title" id="jot-title" type="text" placeholder="$placeholdertitle" value="$title" class="jothidden" style="display:none" />
+               <div id="character-counter" class="grey jothidden"></div>
+
+               <input type="hidden" name="type" value="$ptyp" />
+               <input type="hidden" name="profile_uid" value="$profile_uid" />
+               <input type="hidden" name="return" value="$return_path" />
+               <input type="hidden" name="location" id="jot-location" value="$defloc" />
+               <input type="hidden" name="coord" id="jot-coord" value="" />
+               <input type="hidden" name="post_id" value="$post_id" />
+               <input type="hidden" name="preview" id="jot-preview" value="0" />
+
+               <textarea rows="5" cols="64" class="profile-jot-text" id="profile-jot-text" name="body" >{{ if $content }}$content{{ else }}$share{{ endif }}</textarea>
+
+               <ul id="jot-tools" class="jothidden" style="display:none">
+                       <li><a href="#" onclick="return false;" id="wall-image-upload" title="$upload">$shortupload</a></a></li>
+                       <li><a href="#" onclick="return false;" id="wall-file-upload"  title="$attach">$shortattach</a></li>
+                       <li><a id="profile-link"  ondragenter="return linkdropper(event);" ondragover="return linkdropper(event);" ondrop="linkdrop(event);" onclick="jotGetLink(); return false;" title="$weblink">$shortweblink</a></li>
+                       <li><a id="profile-video" onclick="jotVideoURL();return false;" title="$gvideo">$shortvideo</a></li>
+                       <li><a id="profile-audio" onclick="jotAudioURL();return false;" title="$audio">$shortaudio</a></li>
+                       <li><a id="profile-location" onclick="jotGetLocation();return false;" title="$setloc">$shortsetloc</a></li>
+                       <li><a id="profile-nolocation" onclick="jotClearLocation();return false;" title="$noloc">$shortnoloc</a></li>
+                       <li><a id="jot-preview-link" onclick="preview_post(); return false;" title="$preview">$preview</a></li>
+                       $jotplugins
+
+                       <li class="perms"><a id="jot-perms-icon" href="#profile-jot-acl-wrapper" class="icon s22 $lockstate $bang"  title="$permset" ></a></li>
+                       <li class="submit"><input type="submit" id="profile-jot-submit" name="submit" value="$share" /></li>
+                       <li id="profile-rotator" class="loading" style="display: none"><img src="images/rotator.gif" alt="$wait" title="$wait"  /></li>
+               </ul>
+       </div>
+       
+       <div id="jot-preview-content" style="display:none;"></div>
+
+       <div style="display: none;">
+               <div id="profile-jot-acl-wrapper" style="width:auto;height:auto;overflow:auto;">
+                       $acl
+                       <hr style="clear:both"/>
+                       <div id="profile-jot-email-label">$emailcc</div><input type="text" name="emailcc" id="profile-jot-email" title="$emtitle" />
+                       <div id="profile-jot-email-end"></div>
+                       $jotnets
+               </div>
+       </div>
+
+</form>
+
+{{ if $content }}<script>initEditor();</script>{{ endif }}
diff --git a/view/theme/quattro/nav.tpl b/view/theme/quattro/nav.tpl
new file mode 100755 (executable)
index 0000000..8c87286
--- /dev/null
@@ -0,0 +1,131 @@
+<header>
+       {# $langselector #}
+
+       <div id="site-location">$sitelocation</div>
+       <div id="banner">$banner</div>
+</header>
+<nav>
+       <ul>
+               {{ if $userinfo }}
+                       <li id="nav-user-linkmenu" class="nav-menu-icon"><a href="#" rel="#nav-user-menu" title="$sitelocation"><img src="$userinfo.icon" alt="$userinfo.name"></a>
+                               <ul id="nav-user-menu" class="menu-popup">
+                                       {{ for $nav.usermenu as $usermenu }}
+                                               <li><a class="$usermenu.2" href="$usermenu.0" title="$usermenu.3">$usermenu.1</a></li>
+                                       {{ endfor }}
+                                       
+                                       {{ if $nav.notifications }}<li><a class="$nav.notifications.2" href="$nav.notifications.0" title="$nav.notifications.3" >$nav.notifications.1</a></li>{{ endif }}
+                                       {{ if $nav.messages }}<li><a class="$nav.messages.2" href="$nav.messages.0" title="$nav.messages.3" >$nav.messages.1</a></li>{{ endif }}
+                                       {{ if $nav.contacts }}<li><a class="$nav.contacts.2" href="$nav.contacts.0" title="$nav.contacts.3" >$nav.contacts.1</a></li>{{ endif }}        
+                               </ul>
+                       </li>
+               {{ endif }}
+               
+               {{ if $nav.community }}
+                       <li id="nav-community-link" class="nav-menu $sel.community">
+                               <a class="$nav.community.2" href="$nav.community.0" title="$nav.community.3" >$nav.community.1</a>
+                       </li>
+               {{ endif }}
+               
+               {{ if $nav.network }}
+                       <li id="nav-network-link" class="nav-menu $sel.network">
+                               <a class="$nav.network.2" href="$nav.network.0" title="$nav.network.3" >$nav.network.1</a>
+                               <span id="net-update" class="nav-notify"></span>
+                       </li>
+               {{ endif }}
+               {{ if $nav.home }}
+                       <li id="nav-home-link" class="nav-menu $sel.home">
+                               <a class="$nav.home.2" href="$nav.home.0" title="$nav.home.3" >$nav.home.1</a>
+                               <span id="home-update" class="nav-notify"></span>
+                       </li>
+               {{ endif }}
+               
+               {{ if $nav.notifications }}
+                       <li  id="nav-notifications-linkmenu" class="nav-menu-icon"><a href="$nav.notifications.0" rel="#nav-notifications-menu" title="$nav.notifications.1"><span class="icon s22 notify">$nav.notifications.1</span></a>
+                               <span id="notify-update" class="nav-notify"></span>
+                               <ul id="nav-notifications-menu" class="menu-popup">
+                                       <li id="nav-notifications-mark-all"><a href="#" onclick="notifyMarkAll(); return false;">$nav.notifications.mark.1</a></li>
+                                       <li id="nav-notifications-see-all"><a href="$nav.notifications.all.0">$nav.notifications.all.1</a></li>
+                                       <li class="empty">$emptynotifications</li>
+                               </ul>
+                       </li>           
+               {{ endif }}             
+               
+               <li id="nav-site-linkmenu" class="nav-menu-icon"><a href="#" rel="#nav-site-menu"><span class="icon s22 gear">Site</span></a>
+                       <ul id="nav-site-menu" class="menu-popup">
+                               {{ if $nav.manage }}<li><a class="$nav.manage.2" href="$nav.manage.0" title="$nav.manage.3">$nav.manage.1</a></li>{{ endif }}                           
+
+                               {{ if $nav.settings }}<li><a class="$nav.settings.2" href="$nav.settings.0" title="$nav.settings.3">$nav.settings.1</a></li>{{ endif }}
+                               {{ if $nav.admin }}<li><a class="$nav.admin.2" href="$nav.admin.0" title="$nav.admin.3" >$nav.admin.1</a></li>{{ endif }}
+
+                               {{ if $nav.logout }}<li><a class="menu-sep $nav.logout.2" href="$nav.logout.0" title="$nav.logout.3" >$nav.logout.1</a></li>{{ endif }}
+                               {{ if $nav.login }}<li><a class="$nav.login.2" href="$nav.login.0" title="$nav.login.3" >$nav.login.1</a><li>{{ endif }}
+                       </ul>           
+               </li>
+               
+               {{ if $nav.help }} 
+               <li id="nav-help-link" class="nav-menu $sel.help">
+                       <a class="$nav.help.2" target="friendika-help" href="$nav.help.0" title="$nav.help.3" >$nav.help.1</a>
+               </li>
+               {{ endif }}
+
+               <li id="nav-search-link" class="nav-menu $sel.search">
+                       <a class="$nav.search.2" href="$nav.search.0" title="$nav.search.3" >$nav.search.1</a>
+               </li>
+               <li id="nav-directory-link" class="nav-menu $sel.directory">
+                       <a class="$nav.directory.2" href="$nav.directory.0" title="$nav.directory.3" >$nav.directory.1</a>
+               </li>
+               
+               {{ if $nav.apps }}
+                       <li id="nav-apps-link" class="nav-menu $sel.apps">
+                               <a class=" $nav.apps.2" href="#" rel="#nav-apps-menu" title="$nav.apps.3" >$nav.apps.1</a>
+                               <ul id="nav-apps-menu" class="menu-popup">
+                                       {{ for $apps as $ap }}
+                                       <li>$ap</li>
+                                       {{ endfor }}
+                               </ul>
+                       </li>
+               {{ endif }}
+       </ul>
+
+</nav>
+<ul id="nav-notifications-template" style="display:none;" rel="template">
+       <li><a href="{0}"><img src="{1}">{2} <span class="notif-when">{3}</span></a></li>
+</ul>
+
+{#
+
+{{ if $nav.logout }}<a id="nav-logout-link" class="nav-link $nav.logout.2" href="$nav.logout.0" title="$nav.logout.3" >$nav.logout.1</a> {{ 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> {{ endif }}
+
+<span id="nav-link-wrapper" >
+
+{{ if $nav.register }}<a id="nav-register-link" class="nav-commlink $nav.register.2" href="$nav.register.0" title="$nav.register.3" >$nav.register.1</a>{{ endif }}
+       
+<a id="nav-help-link" class="nav-link $nav.help.2" target="friendika-help" href="$nav.help.0" title="$nav.help.3" >$nav.help.1</a>
+       
+{{ if $nav.apps }}<a id="nav-apps-link" class="nav-link $nav.apps.2" href="$nav.apps.0" title="$nav.apps.3" >$nav.apps.1</a>{{ endif }}
+
+<a id="nav-search-link" class="nav-link $nav.search.2" href="$nav.search.0" title="$nav.search.3" >$nav.search.1</a>
+<a id="nav-directory-link" class="nav-link $nav.directory.2" href="$nav.directory.0" title="$nav.directory.3" >$nav.directory.1</a>
+
+{{ if $nav.admin }}<a id="nav-admin-link" class="nav-link $nav.admin.2" href="$nav.admin.0" title="$nav.admin.3" >$nav.admin.1</a>{{ endif }}
+
+{{ if $nav.notifications }}
+<a id="nav-notify-link" class="nav-commlink $nav.notifications.2" href="$nav.notifications.0" title="$nav.notifications.3" >$nav.notifications.1</a>
+<span id="notify-update" class="nav-ajax-left"></span>
+{{ endif }}
+{{ if $nav.messages }}
+<a id="nav-messages-link" class="nav-commlink $nav.messages.2" href="$nav.messages.0" title="$nav.messages.3" >$nav.messages.1</a>
+<span id="mail-update" class="nav-ajax-left"></span>
+{{ endif }}
+
+{{ if $nav.manage }}<a id="nav-manage-link" class="nav-commlink $nav.manage.2" href="$nav.manage.0" title="$nav.manage.3">$nav.manage.1</a>{{ endif }}
+
+{{ if $nav.settings }}<a id="nav-settings-link" class="nav-link $nav.settings.2" href="$nav.settings.0" title="$nav.settings.3">$nav.settings.1</a>{{ endif }}
+{{ if $nav.profiles }}<a id="nav-profiles-link" class="nav-link $nav.profiles.2" href="$nav.profiles.0" title="$nav.profiles.3" >$nav.profiles.1</a>{{ endif }}
+
+
+</span>
+<span id="nav-end"></span>
+<span id="banner">$banner</span>
+#}
diff --git a/view/theme/quattro/nets.tpl b/view/theme/quattro/nets.tpl
new file mode 100755 (executable)
index 0000000..cbadf13
--- /dev/null
@@ -0,0 +1,12 @@
+<div id="nets-sidebar" class="widget">
+       <h3>$title</h3>
+       <div id="nets-desc">$desc</div>
+       
+       <ul class="nets-ul">
+               <li class="tool {{ if $sel_all }}selected{{ endif }}"><a href="$base" class="nets-link nets-all">$all</a>
+               {{ for $nets as $net }}
+                       <li class="tool {{ if $net.selected }}selected{{ endif }}"><a href="$base?f=&nets=$net.ref" class="nets-link">$net.name</a></li>
+               {{ endfor }}
+       </ul>
+       
+</div>
diff --git a/view/theme/quattro/profile_vcard.tpl b/view/theme/quattro/profile_vcard.tpl
new file mode 100755 (executable)
index 0000000..7cd02f1
--- /dev/null
@@ -0,0 +1,63 @@
+<div class="vcard">
+
+       <div class="tool">
+               <div class="fn label">$profile.name</div>
+               {{ if $profile.edit }}
+                       <div class="action">
+                       <a class="icon s16 edit ttright" href="#" rel="#profiles-menu" title="$profile.edit.3"><span>$profile.edit.1</span></a>
+                       <ul id="profiles-menu" class="menu-popup">
+                               {{ for $profile.menu.entries as $e }}
+                               <li>
+                                       <a href="profiles/$e.id"><img src='$e.photo'>$e.profile_name</a>
+                               </li>
+                               {{ endfor }}
+                               <li><a href="profile_photo" >$profile.menu.chg_photo</a></li>
+                               <li><a href="profiles/new" id="profile-listing-new-link">$profile.menu.cr_new</a></li>
+                               
+                       </ul>
+                       </div>
+               {{ endif }}
+       </div>
+
+
+       {{ if $pdesc }}<div class="title">$profile.pdesc</div>{{ endif }}
+       <div id="profile-photo-wrapper"><img class="photo" width="175" height="175" src="$profile.photo?rev=$profile.picdate" alt="$profile.name" /></div>
+
+
+
+       {{ if $location }}
+               <dl class="location"><dt class="location-label">$location</dt> 
+               <dd class="adr">
+                       {{ if $profile.address }}<div class="street-address">$profile.address</div>{{ endif }}
+                       <span class="city-state-zip">
+                               <span class="locality">$profile.locality</span>{{ if $profile.locality }}, {{ endif }}
+                               <span class="region">$profile.region</span>
+                               <span class="postal-code">$profile.postal-code</span>
+                       </span>
+                       {{ if $profile.country-name }}<span class="country-name">$profile.country-name</span>{{ endif }}
+               </dd>
+               </dl>
+       {{ endif }}
+
+       {{ if $gender }}<dl class="mf"><dt class="gender-label">$gender</dt> <dd class="x-gender">$profile.gender</dd></dl>{{ endif }}
+       
+       {{ if $profile.pubkey }}<div class="key" style="display:none;">$profile.pubkey</div>{{ endif }}
+
+       {{ if $marital }}<dl class="marital"><dt class="marital-label"><span class="heart">&hearts;</span>$marital</dt><dd class="marital-text">$profile.marital</dd></dl>{{ endif }}
+
+       {{ if $homepage }}<dl class="homepage"><dt class="homepage-label">$homepage</dt><dd class="homepage-url"><a href="$profile.homepage" target="external-link">$profile.homepage</a></dd></dl>{{ endif }}
+
+       {{ inc diaspora_vcard.tpl }}{{ endinc }}
+       
+       <div id="profile-extra-links">
+               <ul>
+                       {{ if $connect }}
+                               <li><a id="dfrn-request-link" href="dfrn_request/$profile.nickname">$connect</a></li>
+                       {{ endif }}
+               </ul>
+       </div>
+</div>
+
+$contact_block
+
+
diff --git a/view/theme/quattro/saved_searches_aside.tpl b/view/theme/quattro/saved_searches_aside.tpl
new file mode 100755 (executable)
index 0000000..9c10a26
--- /dev/null
@@ -0,0 +1,15 @@
+<div id="saved-search-list" class="widget">
+       <h3 class="title">$title</h3>
+
+       <ul id="saved-search-ul">
+               {{ for $saved as $search }}
+                       <li class="tool {{if $search.selected}}selected{{endif}}">
+                                       <a href="network/?f=&search=$search.encodedterm" class="label" >$search.term</a>
+                                       <a href="network/?f=&remove=1&search=$search.encodedterm" class="action icon s10 delete" title="$search.delete" onclick="return confirmDelete();"></a>
+                       </li>
+               {{ endfor }}
+       </ul>
+       
+       $searchbox
+       
+</div>
diff --git a/view/theme/quattro/search_item.tpl b/view/theme/quattro/search_item.tpl
new file mode 100755 (executable)
index 0000000..80d6678
--- /dev/null
@@ -0,0 +1,91 @@
+
+<div class="wall-item-decor">
+       <span class="icon s22 star $item.isstarred" id="starred-$item.id" title="$item.star.starred">$item.star.starred</span>
+       {{ if $item.lock }}<span class="icon s22 lock fakelink" onclick="lockview(event,$item.id);" title="$item.lock">$item.lock</span>{{ endif }}     
+       <img id="like-rotator-$item.id" class="like-rotator" src="images/rotator.gif" alt="$item.wait" title="$item.wait" style="display: none;" />
+</div>
+
+<div class="wall-item-container $item.indent">
+       <div class="wall-item-item">
+               <div class="wall-item-info">
+                       <div class="contact-photo-wrapper"
+                               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="contact-photo$item.sparkle" id="wall-item-photo-$item.id" alt="$item.name" />
+                               </a>
+                               <a href="#" rel="#wall-item-photo-menu-$item.id" class="contact-photo-menu-button icon s16 menu" id="wall-item-photo-menu-button-$item.id">menu</a>
+                               <ul class="wall-item-menu menu-popup" id="wall-item-photo-menu-$item.id">
+                               $item.item_photo_menu
+                               </ul>
+                               
+                       </div>
+                       <div class="wall-item-location">$item.location</div>    
+               </div>
+               <div class="wall-item-content">
+                       {{ if $item.title }}<h2><a href="$item.plink.href">$item.title</a></h2>{{ endif }}
+                       $item.body
+               </div>
+       </div>
+       <div class="wall-item-bottom">
+               <div class="wall-item-links">
+               </div>
+               <div class="wall-item-tags">
+                       {{ for $item.tags as $tag }}
+                               <span class='tag'>$tag</span>
+                       {{ endfor }}
+               </div>
+       </div>
+       <div class="wall-item-bottom">
+               <div class="">
+                       {{ if $item.plink }}<a class="icon s16 link" title="$item.plink.title" href="$item.plink.href">$item.plink.title</a>{{ endif }}
+               </div>
+               <div class="wall-item-actions">
+                       <div class="wall-item-actions-author">
+                               <a href="$item.profile_url" target="redir" title="$item.linktitle" class="wall-item-name-link"><span class="wall-item-name$item.sparkle">$item.name</span></a> <span class="wall-item-ago">$item.ago</span>
+                       </div>
+                       
+                       <div class="wall-item-actions-social">
+                       {{ if $item.star }}
+                               <a href="#" id="star-$item.id" onclick="dostar($item.id); return false;"  class="$item.star.classdo"  title="$item.star.do">$item.star.do</a>
+                               <a href="#" id="unstar-$item.id" onclick="dostar($item.id); return false;"  class="$item.star.classundo"  title="$item.star.undo">$item.star.undo</a>
+                               <a href="#" id="tagger-$item.id" onclick="itemTag($item.id); return false;" class="$item.star.classtagger" title="$item.star.tagger">$item.star.tagger</a>
+                       {{ endif }}
+                       
+                       {{ if $item.vote }}
+                               <a href="#" id="like-$item.id" title="$item.vote.like.0" onclick="dolike($item.id,'like'); return false">$item.vote.like.1</a>
+                               <a href="#" id="dislike-$item.id" title="$item.vote.dislike.0" onclick="dolike($item.id,'dislike'); return false">$item.vote.dislike.1</a>
+                       {{ endif }}
+                                               
+                       {{ if $item.vote.share }}
+                               <a href="#" id="share-$item.id" title="$item.vote.share.0" onclick="jotShare($item.id); return false">$item.vote.share.1</a>
+                       {{ endif }}                     
+                       </div>
+                       
+                       <div class="wall-item-actions-tools">
+
+                               {{ if $item.drop.dropping }}
+                                       <input type="checkbox" title="$item.drop.select" name="itemselected[]" class="item-select" value="$item.id" />
+                                       <a href="item/drop/$item.id" onclick="return confirmDelete();" class="icon delete s16" title="$item.drop.delete">$item.drop.delete</a>
+                               {{ endif }}
+                               {{ if $item.edpost }}
+                                       <a class="icon edit s16" href="$item.edpost.0" title="$item.edpost.1"></a>
+                               {{ endif }}
+                       </div>
+                       
+               </div>
+       </div>
+       <div class="wall-item-bottom">
+               <div class="wall-item-links"></div>
+               <div class="wall-item-like" id="wall-item-like-$item.id">$item.like</div>
+               <div class="wall-item-dislike" id="wall-item-dislike-$item.id">$item.dislike</div>
+               {{ if $item.conv }}
+               <div class="wall-item-conv" id="wall-item-conv-$item.id" >
+                       <a href='$item.conv.href' id='context-$item.id' title='$item.conv.title'>$item.conv.title</a>
+               {{ endif }}
+               </div>
+       </div>
+       
+       
+</div>
+
diff --git a/view/theme/quattro/wall_item.tpl b/view/theme/quattro/wall_item.tpl
new file mode 100755 (executable)
index 0000000..e771db0
--- /dev/null
@@ -0,0 +1,90 @@
+
+<div class="wall-item-decor">
+       <span class="icon s22 star $item.isstarred" id="starred-$item.id" title="$item.star.starred">$item.star.starred</span>
+       {{ if $item.lock }}<span class="icon s22 lock fakelink" onclick="lockview(event,$item.id);" title="$item.lock">$item.lock</span>{{ endif }}     
+       <img id="like-rotator-$item.id" class="like-rotator" src="images/rotator.gif" alt="$item.wait" title="$item.wait" style="display: none;" />
+</div>
+
+<div class="wall-item-container $item.indent">
+       <div class="wall-item-item">
+               <div class="wall-item-info">
+                       <div class="contact-photo-wrapper"
+                               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="contact-photo-link" id="wall-item-photo-link-$item.id">
+                                       <img src="$item.thumb" class="contact-photo$item.sparkle" id="wall-item-photo-$item.id" alt="$item.name" />
+                               </a>
+                               <a href="#" rel="#wall-item-photo-menu-$item.id" class="contact-photo-menu-button icon s16 menu" id="wall-item-photo-menu-button-$item.id">menu</a>
+                               <ul class="contact-menu menu-popup" id="wall-item-photo-menu-$item.id">
+                               $item.item_photo_menu
+                               </ul>
+                               
+                       </div>
+                       <div class="wall-item-location">$item.location</div>    
+               </div>
+               <div class="wall-item-content">
+                       {{ if $item.title }}<h2><a href="$item.plink.href">$item.title</a></h2>{{ endif }}
+                       $item.body
+               </div>
+       </div>
+       <div class="wall-item-bottom">
+               <div class="wall-item-links">
+               </div>
+               <div class="wall-item-tags">
+                       {{ for $item.tags as $tag }}
+                               <span class='tag'>$tag</span>
+                       {{ endfor }}
+               </div>
+       </div>
+       <div class="wall-item-bottom">
+               <div class="">
+                       {{ if $item.plink }}<a class="icon s16 link" title="$item.plink.title" href="$item.plink.href">$item.plink.title</a>{{ endif }}
+               </div>
+               <div class="wall-item-actions">
+                       <div class="wall-item-actions-author">
+                               <a href="$item.profile_url" target="redir" title="$item.linktitle" class="wall-item-name-link"><span class="wall-item-name$item.sparkle">$item.name</span></a> <span class="wall-item-ago">$item.ago</span>
+                       </div>
+                       
+                       <div class="wall-item-actions-social">
+                       {{ if $item.star }}
+                               <a href="#" id="star-$item.id" onclick="dostar($item.id); return false;"  class="$item.star.classdo"  title="$item.star.do">$item.star.do</a>
+                               <a href="#" id="unstar-$item.id" onclick="dostar($item.id); return false;"  class="$item.star.classundo"  title="$item.star.undo">$item.star.undo</a>
+                               <a href="#" id="tagger-$item.id" onclick="itemTag($item.id); return false;" class="$item.star.classtagger" title="$item.star.tagger">$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">$item.filer</a>
+                       {{ endif }}                     
+                       
+                       {{ if $item.vote }}
+                               <a href="#" id="like-$item.id" title="$item.vote.like.0" onclick="dolike($item.id,'like'); return false">$item.vote.like.1</a>
+                               <a href="#" id="dislike-$item.id" title="$item.vote.dislike.0" onclick="dolike($item.id,'dislike'); return false">$item.vote.dislike.1</a>
+                       {{ endif }}
+                                               
+                       {{ if $item.vote.share }}
+                               <a href="#" id="share-$item.id" title="$item.vote.share.0" onclick="jotShare($item.id); return false">$item.vote.share.1</a>
+                       {{ endif }}                     
+                       </div>
+                       
+                       <div class="wall-item-actions-tools">
+
+                               {{ if $item.drop.dropping }}
+                                       <input type="checkbox" title="$item.drop.select" name="itemselected[]" class="item-select" value="$item.id" />
+                                       <a href="item/drop/$item.id" onclick="return confirmDelete();" class="icon delete s16" title="$item.drop.delete">$item.drop.delete</a>
+                               {{ endif }}
+                               {{ if $item.edpost }}
+                                       <a class="icon edit s16" href="$item.edpost.0" title="$item.edpost.1"></a>
+                               {{ endif }}
+                       </div>
+                       
+               </div>
+       </div>
+       <div class="wall-item-bottom">
+               <div class="wall-item-links"></div>
+               <div class="wall-item-like" id="wall-item-like-$item.id">$item.like</div>
+               <div class="wall-item-dislike" id="wall-item-dislike-$item.id">$item.dislike</div>      
+       </div>
+</div>
+
+<div class="wall-item-comment-wrapper" >
+       $item.comment
+</div>
diff --git a/view/theme/quattro/wallwall_item.tpl b/view/theme/quattro/wallwall_item.tpl
new file mode 100755 (executable)
index 0000000..693ebab
--- /dev/null
@@ -0,0 +1,96 @@
+<div class="wall-item-decor">
+       <span class="icon s22 star $item.isstarred" id="starred-$item.id" title="$item.star.starred">$item.star.starred</span>
+       {{ if $item.lock }}<span class="icon s22 lock fakelink" onclick="lockview(event,$item.id);" title="$item.lock">$item.lock</span>{{ endif }}     
+       <img id="like-rotator-$item.id" class="like-rotator" src="images/rotator.gif" alt="$item.wait" title="$item.wait" style="display: none;" />
+</div>
+
+<div class="wall-item-container $item.indent">
+       <div class="wall-item-item">
+               <div class="wall-item-info">
+                       <div class="contact-photo-wrapper mframe wwfrom"
+                               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="contact-photo-link" id="wall-item-photo-link-$item.id">
+                                       <img src="$item.thumb" class="contact-photo $item.sparkle" id="wall-item-photo-$item.id" alt="$item.name" />
+                               </a>
+                               <a href="#" rel="#wall-item-photo-menu-$item.id" class="contact-photo-menu-button icon s16 menu" id="wall-item-photo-menu-button-$item.id">menu</a>
+                               <ul class="contact-menu menu-popup" id="wall-item-photo-menu-$item.id">
+                               $item.item_photo_menu
+                               </ul>
+                               
+                       </div>  
+                       <div class="contact-photo-wrapper mframe wwto" id="wall-item-ownerphoto-wrapper-$item.id" >
+                               <a href="$item.owner_url" target="redir" title="$item.olinktitle" class="contact-photo-link" id="wall-item-ownerphoto-link-$item.id">
+                                       <img src="$item.owner_photo" class="contact-photo $item.osparkle" id="wall-item-ownerphoto-$item.id" alt="$item.owner_name" />
+                               </a>
+                       </div>                  
+                       <div class="wall-item-location">$item.location</div>    
+               </div>
+               <div class="wall-item-content">
+                       {{ if $item.title }}<h2><a href="$item.plink.href">$item.title</a></h2>{{ endif }}
+                       $item.body
+               </div>
+       </div>
+       <div class="wall-item-bottom">
+               <div class="wall-item-links">
+               </div>
+               <div class="wall-item-tags">
+                       {{ for $item.tags as $tag }}
+                               <span class='tag'>$tag</span>
+                       {{ endfor }}
+               </div>
+       </div>  
+       <div class="wall-item-bottom">
+               <div class="wall-item-links">
+                       {{ if $item.plink }}<a class="icon s16 link" title="$item.plink.title" href="$item.plink.href">$item.plink.title</a>{{ endif }}
+               </div>
+               <div class="wall-item-actions">
+                       <div class="wall-item-actions-author">
+                               <a href="$item.profile_url" target="redir" title="$item.linktitle" class="wall-item-name-link"><span class="wall-item-name$item.sparkle">$item.name</span></a> <span class="wall-item-ago">$item.ago</span>
+                                <br/>$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
+                                
+                       </div>
+                       
+                       <div class="wall-item-actions-social">
+                       {{ if $item.star }}
+                               <a href="#" id="star-$item.id" onclick="dostar($item.id); return false;"  class="$item.star.classdo"  title="$item.star.do">$item.star.do</a>
+                               <a href="#" id="unstar-$item.id" onclick="dostar($item.id); return false;"  class="$item.star.classundo"  title="$item.star.undo">$item.star.undo</a>
+                               <a href="#" id="tagger-$item.id" onclick="itemTag($item.id); return false;" class="$item.star.classtagger" title="$item.star.tagger">$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">$item.filer</a>
+                       {{ endif }}                     
+                       
+                       {{ if $item.vote }}
+                               <a href="#" id="like-$item.id" title="$item.vote.like.0" onclick="dolike($item.id,'like'); return false">$item.vote.like.1</a>
+                               <a href="#" id="dislike-$item.id" title="$item.vote.dislike.0" onclick="dolike($item.id,'dislike'); return false">$item.vote.dislike.1</a>
+                       {{ endif }}
+                                               
+                       {{ if $item.vote.share }}
+                               <a href="#" id="share-$item.id" title="$item.vote.share.0" onclick="jotShare($item.id); return false">$item.vote.share.1</a>
+                       {{ endif }}                     
+                       </div>
+                       
+                       <div class="wall-item-actions-tools">
+
+                               {{ if $item.drop.dropping }}
+                                       <input type="checkbox" title="$item.drop.select" name="itemselected[]" class="item-select" value="$item.id" />
+                                       <a href="item/drop/$item.id" onclick="return confirmDelete();" class="icon delete s16" title="$item.drop.delete">$item.drop.delete</a>
+                               {{ endif }}
+                               {{ if $item.edpost }}
+                                       <a class="icon edit s16" href="$item.edpost.0" title="$item.edpost.1"></a>
+                               {{ endif }}
+                       </div>
+                       
+               </div>
+       </div>
+       <div class="wall-item-bottom">
+               <div class="wall-item-links"></div>
+               <div class="wall-item-like" id="wall-item-like-$item.id">$item.like</div>
+               <div class="wall-item-dislike" id="wall-item-dislike-$item.id">$item.dislike</div>      
+       </div>  
+</div>
+<div class="wall-item-comment-wrapper" >
+       $item.comment
+</div>
index e771db0682f3e48f9db8a0c12606a51bd37d1580..9d1dd7d70e45c183d353b9925c4339ec1dc5d53b 100755 (executable)
@@ -1,90 +1,78 @@
-
-<div class="wall-item-decor">
-       <span class="icon s22 star $item.isstarred" id="starred-$item.id" title="$item.star.starred">$item.star.starred</span>
-       {{ if $item.lock }}<span class="icon s22 lock fakelink" onclick="lockview(event,$item.id);" title="$item.lock">$item.lock</span>{{ endif }}     
-       <img id="like-rotator-$item.id" class="like-rotator" src="images/rotator.gif" alt="$item.wait" title="$item.wait" style="display: none;" />
-</div>
-
-<div class="wall-item-container $item.indent">
-       <div class="wall-item-item">
-               <div class="wall-item-info">
-                       <div class="contact-photo-wrapper"
-                               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="contact-photo-link" id="wall-item-photo-link-$item.id">
-                                       <img src="$item.thumb" class="contact-photo$item.sparkle" id="wall-item-photo-$item.id" alt="$item.name" />
+<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" 
+                                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>
-                               <a href="#" rel="#wall-item-photo-menu-$item.id" class="contact-photo-menu-button icon s16 menu" id="wall-item-photo-menu-button-$item.id">menu</a>
-                               <ul class="contact-menu menu-popup" id="wall-item-photo-menu-$item.id">
-                               $item.item_photo_menu
-                               </ul>
-                               
+                               <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>
+                                               $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 class="wall-item-location">$item.location</div>    
-               </div>
-               <div class="wall-item-content">
-                       {{ if $item.title }}<h2><a href="$item.plink.href">$item.title</a></h2>{{ endif }}
-                       $item.body
-               </div>
-       </div>
-       <div class="wall-item-bottom">
-               <div class="wall-item-links">
-               </div>
-               <div class="wall-item-tags">
-                       {{ for $item.tags as $tag }}
-                               <span class='tag'>$tag</span>
-                       {{ endfor }}
                </div>
-       </div>
-       <div class="wall-item-bottom">
-               <div class="">
-                       {{ if $item.plink }}<a class="icon s16 link" title="$item.plink.title" href="$item.plink.href">$item.plink.title</a>{{ endif }}
+               <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 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='tag'>$tag</span>
+                                               {{ endfor }}
+                                       </div>
+                       </div>
                </div>
-               <div class="wall-item-actions">
-                       <div class="wall-item-actions-author">
-                               <a href="$item.profile_url" target="redir" title="$item.linktitle" class="wall-item-name-link"><span class="wall-item-name$item.sparkle">$item.name</span></a> <span class="wall-item-ago">$item.ago</span>
+               <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>
-                       
-                       <div class="wall-item-actions-social">
+                       {{ 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"></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="star-$item.id" onclick="dostar($item.id); return false;"  class="$item.star.classdo"  title="$item.star.do">$item.star.do</a>
-                               <a href="#" id="unstar-$item.id" onclick="dostar($item.id); return false;"  class="$item.star.classundo"  title="$item.star.undo">$item.star.undo</a>
-                               <a href="#" id="tagger-$item.id" onclick="itemTag($item.id); return false;" class="$item.star.classtagger" title="$item.star.tagger">$item.star.tagger</a>
+                       <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">$item.filer</a>
-                       {{ endif }}                     
-                       
-                       {{ if $item.vote }}
-                               <a href="#" id="like-$item.id" title="$item.vote.like.0" onclick="dolike($item.id,'like'); return false">$item.vote.like.1</a>
-                               <a href="#" id="dislike-$item.id" title="$item.vote.dislike.0" onclick="dolike($item.id,'dislike'); return false">$item.vote.dislike.1</a>
-                       {{ endif }}
-                                               
-                       {{ if $item.vote.share }}
-                               <a href="#" id="share-$item.id" title="$item.vote.share.0" onclick="jotShare($item.id); return false">$item.vote.share.1</a>
+                       <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-actions-tools">
-
-                               {{ if $item.drop.dropping }}
-                                       <input type="checkbox" title="$item.drop.select" name="itemselected[]" class="item-select" value="$item.id" />
-                                       <a href="item/drop/$item.id" onclick="return confirmDelete();" class="icon delete s16" title="$item.drop.delete">$item.drop.delete</a>
-                               {{ endif }}
-                               {{ if $item.edpost }}
-                                       <a class="icon edit s16" href="$item.edpost.0" title="$item.edpost.1"></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-bottom">
-               <div class="wall-item-links"></div>
-               <div class="wall-item-like" id="wall-item-like-$item.id">$item.like</div>
-               <div class="wall-item-dislike" id="wall-item-dislike-$item.id">$item.dislike</div>      
+       <div class="wall-item-wrapper-end"></div>
+       <div class="wall-item-like" id="wall-item-like-$item.id">$item.like</div>
+       <div class="wall-item-dislike" id="wall-item-dislike-$item.id">$item.dislike</div>
+       <div class="wall-item-comment-wrapper" >
+       $item.comment
        </div>
-</div>
 
-<div class="wall-item-comment-wrapper" >
-       $item.comment
+<div class="wall-item-outside-wrapper-end$item.indent" ></div>
 </div>
index 693ebaba6f3a81e082480e55770a8404224d49f2..bad5680c7a11c7e0bb9deb477df74b1db4e3cfb7 100755 (executable)
@@ -1,96 +1,85 @@
-<div class="wall-item-decor">
-       <span class="icon s22 star $item.isstarred" id="starred-$item.id" title="$item.star.starred">$item.star.starred</span>
-       {{ if $item.lock }}<span class="icon s22 lock fakelink" onclick="lockview(event,$item.id);" title="$item.lock">$item.lock</span>{{ endif }}     
-       <img id="like-rotator-$item.id" class="like-rotator" src="images/rotator.gif" alt="$item.wait" title="$item.wait" style="display: none;" />
-</div>
+<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>
+                        $item.item_photo_menu
+                    </ul>
+                </div>
 
-<div class="wall-item-container $item.indent">
-       <div class="wall-item-item">
-               <div class="wall-item-info">
-                       <div class="contact-photo-wrapper mframe wwfrom"
-                               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="contact-photo-link" id="wall-item-photo-link-$item.id">
-                                       <img src="$item.thumb" class="contact-photo $item.sparkle" id="wall-item-photo-$item.id" alt="$item.name" />
-                               </a>
-                               <a href="#" rel="#wall-item-photo-menu-$item.id" class="contact-photo-menu-button icon s16 menu" id="wall-item-photo-menu-button-$item.id">menu</a>
-                               <ul class="contact-menu menu-popup" id="wall-item-photo-menu-$item.id">
-                               $item.item_photo_menu
-                               </ul>
-                               
-                       </div>  
-                       <div class="contact-photo-wrapper mframe wwto" id="wall-item-ownerphoto-wrapper-$item.id" >
-                               <a href="$item.owner_url" target="redir" title="$item.olinktitle" class="contact-photo-link" id="wall-item-ownerphoto-link-$item.id">
-                                       <img src="$item.owner_photo" class="contact-photo $item.osparkle" id="wall-item-ownerphoto-$item.id" alt="$item.owner_name" />
-                               </a>
-                       </div>                  
-                       <div class="wall-item-location">$item.location</div>    
-               </div>
-               <div class="wall-item-content">
-                       {{ if $item.title }}<h2><a href="$item.plink.href">$item.title</a></h2>{{ endif }}
-                       $item.body
-               </div>
-       </div>
-       <div class="wall-item-bottom">
-               <div class="wall-item-links">
-               </div>
-               <div class="wall-item-tags">
-                       {{ for $item.tags as $tag }}
-                               <span class='tag'>$tag</span>
-                       {{ endfor }}
+                       </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>  
-       <div class="wall-item-bottom">
-               <div class="wall-item-links">
-                       {{ if $item.plink }}<a class="icon s16 link" title="$item.plink.title" href="$item.plink.href">$item.plink.title</a>{{ endif }}
+               <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='tag'>$tag</span>
+                                               {{ endfor }}
+                                       </div>
+                       </div>
                </div>
-               <div class="wall-item-actions">
-                       <div class="wall-item-actions-author">
-                               <a href="$item.profile_url" target="redir" title="$item.linktitle" class="wall-item-name-link"><span class="wall-item-name$item.sparkle">$item.name</span></a> <span class="wall-item-ago">$item.ago</span>
-                                <br/>$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
-                                
+               <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>
-                       
-                       <div class="wall-item-actions-social">
+                       {{ 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"></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="star-$item.id" onclick="dostar($item.id); return false;"  class="$item.star.classdo"  title="$item.star.do">$item.star.do</a>
-                               <a href="#" id="unstar-$item.id" onclick="dostar($item.id); return false;"  class="$item.star.classundo"  title="$item.star.undo">$item.star.undo</a>
-                               <a href="#" id="tagger-$item.id" onclick="itemTag($item.id); return false;" class="$item.star.classtagger" title="$item.star.tagger">$item.star.tagger</a>
-
+                       <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">$item.filer</a>
+                       <a href="#" id="filer-$item.id" onclick="itemFiler($item.id); return false;" class="filer-item filer-icon" title="$item.filer"></a>
                        {{ endif }}                     
                        
-                       {{ if $item.vote }}
-                               <a href="#" id="like-$item.id" title="$item.vote.like.0" onclick="dolike($item.id,'like'); return false">$item.vote.like.1</a>
-                               <a href="#" id="dislike-$item.id" title="$item.vote.dislike.0" onclick="dolike($item.id,'dislike'); return false">$item.vote.dislike.1</a>
-                       {{ endif }}
-                                               
-                       {{ if $item.vote.share }}
-                               <a href="#" id="share-$item.id" title="$item.vote.share.0" onclick="jotShare($item.id); return false">$item.vote.share.1</a>
-                       {{ endif }}                     
-                       </div>
-                       
-                       <div class="wall-item-actions-tools">
-
-                               {{ if $item.drop.dropping }}
-                                       <input type="checkbox" title="$item.drop.select" name="itemselected[]" class="item-select" value="$item.id" />
-                                       <a href="item/drop/$item.id" onclick="return confirmDelete();" class="icon delete s16" title="$item.drop.delete">$item.drop.delete</a>
-                               {{ endif }}
-                               {{ if $item.edpost }}
-                                       <a class="icon edit s16" href="$item.edpost.0" title="$item.edpost.1"></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>
-                       
+                               {{ 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-bottom">
-               <div class="wall-item-links"></div>
-               <div class="wall-item-like" id="wall-item-like-$item.id">$item.like</div>
-               <div class="wall-item-dislike" id="wall-item-dislike-$item.id">$item.dislike</div>      
        </div>  
-</div>
-<div class="wall-item-comment-wrapper" >
+       <div class="wall-item-wrapper-end"></div>
+       <div class="wall-item-like" id="wall-item-like-$item.id">$item.like</div>
+       <div class="wall-item-dislike" 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>
+