]> git.mxchange.org Git - friendica.git/commitdiff
update smart templates
authorZach Prezkuta <fermion@gmx.com>
Sat, 26 Jan 2013 20:07:54 +0000 (13:07 -0700)
committerZach Prezkuta <fermion@gmx.com>
Sat, 26 Jan 2013 20:07:54 +0000 (13:07 -0700)
32 files changed:
view/smarty3/comment_item.tpl
view/smarty3/confirm.tpl [new file with mode: 0644]
view/smarty3/contact_template.tpl
view/smarty3/like_noshare.tpl
view/smarty3/manage.tpl [new file with mode: 0644]
view/smarty3/navigation.tpl [new file with mode: 0644]
view/smarty3/photos_default_uploader_box.tpl [new file with mode: 0644]
view/smarty3/photos_default_uploader_submit.tpl [new file with mode: 0644]
view/smarty3/photos_upload.tpl
view/theme/comix-plain/smarty3/comment_item.tpl
view/theme/comix/smarty3/comment_item.tpl
view/theme/decaf-mobile/smarty3/acl_selector.tpl
view/theme/decaf-mobile/smarty3/login.tpl
view/theme/decaf-mobile/smarty3/register.tpl
view/theme/decaf-mobile/smarty3/wall_thread.tpl
view/theme/decaf-mobile/smarty3/wall_thread_toponly.tpl
view/theme/diabook/smarty3/comment_item.tpl
view/theme/diabook/smarty3/contact_template.tpl
view/theme/dispy/smarty3/comment_item.tpl
view/theme/dispy/smarty3/contact_template.tpl
view/theme/duepuntozero/smarty3/comment_item.tpl
view/theme/facepark/smarty3/comment_item.tpl
view/theme/frost-mobile/smarty3/comment_item.tpl
view/theme/frost-mobile/smarty3/contact_template.tpl
view/theme/frost-mobile/smarty3/photos_upload.tpl
view/theme/frost/smarty3/comment_item.tpl
view/theme/frost/smarty3/contact_template.tpl
view/theme/frost/smarty3/photos_upload.tpl
view/theme/quattro/smarty3/comment_item.tpl
view/theme/quattro/smarty3/contact_template.tpl
view/theme/testbubble/smarty3/comment_item.tpl
view/theme/vier/smarty3/comment_item.tpl

index 40a3e30ad21a53eb75e85e784244a3e06bf2e300..caf98168d05a33addb4f6d8309bbd529ee0f2877 100644 (file)
@@ -12,7 +12,7 @@
                                <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="return" value="{{$return_path}}" />-->*}}
                                <input type="hidden" name="jsreload" value="{{$jsreload}}" />
                                <input type="hidden" name="preview" id="comment-preview-inp-{{$id}}" value="0" />
                                <input type="hidden" name="post_id_random" value="{{$rand_num}}" />
diff --git a/view/smarty3/confirm.tpl b/view/smarty3/confirm.tpl
new file mode 100644 (file)
index 0000000..df8d26e
--- /dev/null
@@ -0,0 +1,19 @@
+{{*
+ *     AUTOMATICALLY GENERATED TEMPLATE
+ *     DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
+<center>
+<form action="{{$confirm_url}}" id="confirm-form" method="{{$method}}">
+
+       <span id="confirm-message">{{$message}}</span>
+       {{foreach $extra_inputs as $input}}
+       <input type="hidden" name="{{$input.name}}" value="{{$input.value}}" />
+       {{/foreach}}
+
+       <input class="confirm-button" id="confirm-submit-button" type="submit" name="{{$confirm_name}}" value="{{$confirm}}" />
+       <input class="confirm-button" id="confirm-cancel-button" type="submit" name="canceled" value="{{$cancel}}" />
+
+</form>
+</center>
+
index 8143a82808e61794c8884d06b8cb155e4215ce5f..8e0e1acc7fd3a1adc124419fb17e95ad0a46eea6 100644 (file)
                        <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}}
+                                               {{foreach $contact.photo_menu as $c}}
+                                               {{if $c.2}}
+                                               <li><a target="redir" href="{{$c.1}}">{{$c.0}}</a></li>
+                                               {{else}}
+                                               <li><a href="{{$c.1}}">{{$c.0}}</a></li>
+                                               {{/if}}
+                                               {{/foreach}}
                     </ul>
                 </div>
                        {{/if}}
index b8258d64a62cec5383de7544c9c0aa7b60f60d8e..62a16227db81c8c10a488f93d0785ead2d116f9a 100644 (file)
@@ -5,6 +5,8 @@
  *}}
 <div class="wall-item-like-buttons" id="wall-item-like-buttons-{{$id}}">
        <a href="#" class="icon like" title="{{$likethis}}" onclick="dolike({{$id}},'like'); return false"></a>
+       {{if $nolike}}
        <a href="#" class="icon dislike" title="{{$nolike}}" onclick="dolike({{$id}},'dislike'); return false"></a>
+       {{/if}}
        <img id="like-rotator-{{$id}}" class="like-rotator" src="images/rotator.gif" alt="{{$wait}}" title="{{$wait}}" style="display: none;" />
 </div>
diff --git a/view/smarty3/manage.tpl b/view/smarty3/manage.tpl
new file mode 100644 (file)
index 0000000..857402c
--- /dev/null
@@ -0,0 +1,22 @@
+{{*
+ *     AUTOMATICALLY GENERATED TEMPLATE
+ *     DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
+<h3>{{$title}}</h3>
+<div id="identity-manage-desc">{{$desc}}</div>
+<div id="identity-manage-choose">{{$choose}}</div>
+<div id="identity-selector-wrapper">
+       <form action="manage" method="post" >
+       <select name="identity" size="4" onchange="this.form.submit();" >
+
+       {{foreach $identities as $id}}
+               <option {{$id.selected}} value="{{$id.uid}}">{{$id.username}} ({{$id.nickname}})</option>
+       {{/foreach}}
+
+       </select>
+       <div id="identity-select-break"></div>
+
+       {{*<!--<input id="identity-submit" type="submit" name="submit" value="{{$submit}}" />-->*}}
+</div></form>
+
diff --git a/view/smarty3/navigation.tpl b/view/smarty3/navigation.tpl
new file mode 100644 (file)
index 0000000..28229c5
--- /dev/null
@@ -0,0 +1,108 @@
+{{*
+ *     AUTOMATICALLY GENERATED TEMPLATE
+ *     DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
+{{*
+ # LOGIN/REGISTER
+ *}}
+<center>
+{{* Use nested if's since the Friendica template engine doesn't support AND or OR in if statements *}}
+{{if $nav.login}}
+<div id="navigation-login-wrapper" >
+{{else}}
+{{if $nav.register}}
+<div id="navigation-login-wrapper" >
+{{/if}}
+{{/if}}
+{{if $nav.login}}<a id="navigation-login-link" class="navigation-link {{$nav.login.2}}" href="{{$nav.login.0}}" title="{{$nav.login.3}}" >{{$nav.login.1}}</a><br/> {{/if}}
+{{if $nav.register}}<a id="navigation-register-link" class="navigation-link {{$nav.register.2}} {{$sel.register}}" href="{{$nav.register.0}}" title="{{$nav.register.3}}" >{{$nav.register.1}}</a><br/>{{/if}}
+{{if $nav.login}}
+</div>
+{{else}}
+{{if $nav.register}}
+</div>
+{{/if}}
+{{/if}}
+
+{{*
+ # NETWORK/HOME
+ *}}
+{{if $nav.network}}
+<div id="navigation-network-wrapper" >
+{{else}}
+{{if $nav.home}}
+<div id="navigation-network-wrapper" >
+{{else}}
+{{if $nav.community}}
+<div id="navigation-network-wrapper" >
+{{/if}}
+{{/if}}
+{{/if}}
+{{if $nav.network}}
+<a id="navigation-network-link" class="navigation-link navigation-commlink {{$nav.network.2}} {{$sel.network}}" href="{{$nav.network.0}}" title="{{$nav.network.3}}" >{{$nav.network.1}}</a><br/>
+<a class="navigation-link navigation-commlink" href="{{$nav.net_reset.0}}" title="{{$nav.net_reset.3}}">{{$nav.net_reset.1}}</a><br/>
+{{/if}}
+{{if $nav.home}}
+<a id="navigation-home-link" class="navigation-link navigation-commlink {{$nav.home.2}} {{$sel.home}}" href="{{$nav.home.0}}" title="{{$nav.home.3}}" >{{$nav.home.1}}</a><br/>
+{{/if}}
+{{if $nav.community}}
+<a id="navigation-community-link" class="navigation-link navigation-commlink {{$nav.community.2}} {{$sel.community}}" href="{{$nav.community.0}}" title="{{$nav.community.3}}" >{{$nav.community.1}}</a><br/>
+{{/if}}
+{{if $nav.network}}
+</div>
+{{else}}
+{{if $nav.home}}
+</div>
+{{else}}
+{{if $nav.community}}
+</div>
+{{/if}}
+{{/if}}
+{{/if}}
+
+{{*
+ # PRIVATE MESSAGES
+ *}}
+{{if $nav.messages}}
+<div id="navigation-messages-wrapper">
+<a id="navigation-messages-link" class="navigation-link navigation-commlink {{$nav.messages.2}} {{$sel.messages}}" href="{{$nav.messages.0}}" title="{{$nav.messages.3}}" >{{$nav.messages.1}}</a><br/>
+</div>
+{{/if}}
+
+       
+{{*
+ # CONTACTS
+ *}}
+<div id="navigation-contacts-wrapper">
+{{if $nav.contacts}}<a id="navigation-contacts-link" class="navigation-link {{$nav.contacts.2}}" href="{{$nav.contacts.0}}" title="{{$nav.contacts.3}}" >{{$nav.contacts.1}}</a><br/>{{/if}}
+<a id="navigation-directory-link" class="navigation-link {{$nav.directory.2}}" href="{{$nav.directory.0}}" title="{{$nav.directory.3}}" >{{$nav.directory.1}}</a><br/>
+{{if $nav.introductions}}
+<a id="navigation-notify-link" class="navigation-link navigation-commlink {{$nav.introductions.2}} {{$sel.introductions}}" href="{{$nav.introductions.0}}" title="{{$nav.introductions.3}}" >{{$nav.introductions.1}}</a><br/>
+{{/if}}
+</div>
+
+{{*
+ # NOTIFICATIONS
+ *}}
+{{if $nav.notifications}}
+<div id="navigation-notifications-wrapper">
+<a id="navigation-notifications-link" class="navigation-link navigation-commlink" href="{{$nav.notifications.0}}" rel="#navigation-notifications-menu" title="{{$nav.notifications.1}}">{{$nav.notifications.1}}</a><br/>
+</div>
+{{/if}}                
+
+{{*
+ # MISCELLANEOUS
+ *}}
+<div id="navigation-misc-wrapper">
+{{if $nav.settings}}<a id="navigation-settings-link" class="navigation-link {{$nav.settings.2}}" href="{{$nav.settings.0}}" title="{{$nav.settings.3}}">{{$nav.settings.1}}</a><br/>{{/if}}
+{{if $nav.manage}}<a id="navigation-manage-link" class="navigation-link navigation-commlink {{$nav.manage.2}} {{$sel.manage}}" href="{{$nav.manage.0}}" title="{{$nav.manage.3}}">{{$nav.manage.1}}</a><br/>{{/if}}
+{{if $nav.profiles}}<a id="navigation-profiles-link" class="navigation-link {{$nav.profiles.2}}" href="{{$nav.profiles.0}}" title="{{$nav.profiles.3}}" >{{$nav.profiles.1}}</a><br/>{{/if}}
+{{if $nav.admin}}<a id="navigation-admin-link" class="navigation-link {{$nav.admin.2}}" href="{{$nav.admin.0}}" title="{{$nav.admin.3}}" >{{$nav.admin.1}}</a><br/>{{/if}}
+<a id="navigation-search-link" class="navigation-link {{$nav.search.2}}" href="{{$nav.search.0}}" title="{{$nav.search.3}}" >{{$nav.search.1}}</a><br/>
+{{if $nav.apps}}<a id="navigation-apps-link" class="navigation-link {{$nav.apps.2}}" href="{{$nav.apps.0}}" title="{{$nav.apps.3}}" >{{$nav.apps.1}}</a><br/>{{/if}}
+{{if $nav.help}} <a id="navigation-help-link" class="navigation-link {{$nav.help.2}}" target="friendica-help" href="{{$nav.help.0}}" title="{{$nav.help.3}}" >{{$nav.help.1}}</a><br/>{{/if}}
+</div>
+
+{{if $nav.logout}}<a id="navigation-logout-link" class="navigation-link {{$nav.logout.2}}" href="{{$nav.logout.0}}" title="{{$nav.logout.3}}" >{{$nav.logout.1}}</a><br/>{{/if}}
+</center>
diff --git a/view/smarty3/photos_default_uploader_box.tpl b/view/smarty3/photos_default_uploader_box.tpl
new file mode 100644 (file)
index 0000000..001d0a3
--- /dev/null
@@ -0,0 +1,6 @@
+{{*
+ *     AUTOMATICALLY GENERATED TEMPLATE
+ *     DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
+<input id="photos-upload-choose" type="file" name="userfile" />
diff --git a/view/smarty3/photos_default_uploader_submit.tpl b/view/smarty3/photos_default_uploader_submit.tpl
new file mode 100644 (file)
index 0000000..87d065d
--- /dev/null
@@ -0,0 +1,8 @@
+{{*
+ *     AUTOMATICALLY GENERATED TEMPLATE
+ *     DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
+ *
+ *}}
+<div class="photos-upload-submit-wrapper" >
+       <input type="submit" name="submit" value="{{$submit}}" id="photos-upload-submit" />
+</div>
index 052ed059a1d9b02a54f807e0aadfa4fbe8eae8c1..f2e95a9b14bdbcf43b7365a603a9012fc53b429b 100644 (file)
 
        <div id="photos-upload-spacer"></div>
 
-       {{$uploader}}
+       {{$alt_uploader}}
 
-       {{$default}}
+       {{$default_upload_box}}
+       {{$default_upload_submit}}
 
        <div class="photos-upload-end" ></div>
 </form>
index 21b7d03563ba1dcae0f396ed31ed7c9562178a3c..6e1bdd7747130d8023d09250fa85ce1750b68b90 100644 (file)
@@ -8,7 +8,7 @@
                                <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="return" value="{{$return_path}}" />-->*}}
                                <input type="hidden" name="jsreload" value="{{$jsreload}}" />
                                <input type="hidden" name="preview" id="comment-preview-inp-{{$id}}" value="0" />
                                <input type="hidden" name="post_id_random" value="{{$rand_num}}" />
index 21b7d03563ba1dcae0f396ed31ed7c9562178a3c..6e1bdd7747130d8023d09250fa85ce1750b68b90 100644 (file)
@@ -8,7 +8,7 @@
                                <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="return" value="{{$return_path}}" />-->*}}
                                <input type="hidden" name="jsreload" value="{{$jsreload}}" />
                                <input type="hidden" name="preview" id="comment-preview-inp-{{$id}}" value="0" />
                                <input type="hidden" name="post_id_random" value="{{$rand_num}}" />
index 49f22ef981081f4cefd58965c2f7dd81c8e6e2d7..b5e8307268ec39d735e862ff5595bf1f29a41f35 100644 (file)
@@ -14,7 +14,7 @@
 </div>
 
 <div class="acl-list-item" rel="acl-template" style="display:none">
-       <img data-src="{0}"><p>{1}{7}</p>
+       <img data-src="{0}"><p>{1}</p>
        <a href="#" class='acl-button-show'>{{$show}}</a>
        <a href="#" class='acl-button-hide'>{{$hide}}</a>
 </div>
index d220321ec95c8cb56504f040703199bf411e972b..69d053181525a9796cbb99984d60e13997f16cd7 100644 (file)
@@ -21,9 +21,9 @@
 
        <br />
        <div id='login-footer'>
-       <div class="login-extra-links">
+       {{*<!--<div class="login-extra-links">
        By signing in you agree to the latest <a href="tos.html" title="{{$tostitle}}" id="terms-of-service-link" >{{$toslink}}</a> and <a href="privacy.html" title="{{$privacytitle}}" id="privacy-link" >{{$privacylink}}</a>
-       </div>
+       </div>-->*}}
 
        <br />
        {{include file="field_checkbox.tpl" field=$lremember}}
index 7dd8c77ca41879f3015c270c966bf8e1538d7b34..3f64bb67252796c88756e8b5f24ead29fc8e8ea3 100644 (file)
@@ -67,9 +67,9 @@
        {{$publish}}
 
        <div id="register-footer">
-       <div class="agreement">
+       {{*<!--<div class="agreement">
        By clicking '{{$regbutt}}' you are agreeing to the latest <a href="tos.html" title="{{$tostitle}}" id="terms-of-service-link" >{{$toslink}}</a> and <a href="privacy.html" title="{{$privacytitle}}" id="privacy-link" >{{$privacylink}}</a>
-       </div>
+       </div>-->*}}
        <br />
 
        <div id="register-submit-wrapper">
index 97769f301719acd957bd746de7a9b7e5460e0c18..058ae43cc5c7289d08a704dfae3b644b12a565e0 100644 (file)
        {{*<!--<div class="wall-item-wrapper-end"></div>-->*}}
        <div class="wall-item-like wall-item-like-full {{$item.indent}}" id="wall-item-like-{{$item.id}}">{{$item.like}}</div>
        <div class="wall-item-dislike wall-item-dislike-full {{$item.indent}}" id="wall-item-dislike-{{$item.id}}">{{$item.dislike}}</div>
-       <div class="wall-item-boring wall-item-boring-full {{$item.indent}}" id="wall-item-boring-{{$item.id}}">{{$item.boring}}</div>
 
        {{if $item.threaded}}
        {{if $item.comment}}
index 6a4da1acc48c9cd92fbcdbd0400f6e0f3efb2b3a..af8626a844d9033b6915456bb2fc1955626b661e 100644 (file)
@@ -84,7 +84,6 @@
        </div>  
        <div class="wall-item-like {{$item.indent}}" id="wall-item-like-{{$item.id}}">{{$item.like}}</div>
        <div class="wall-item-dislike {{$item.indent}}" id="wall-item-dislike-{{$item.id}}">{{$item.dislike}}</div>
-       <div class="wall-item-boring {{$item.indent}}" id="wall-item-boring-{{$item.id}}">{{$item.boring}}</div>
 
        <div class="hide-comments-outer">
        <a href="display/{{$user.nickname}}/{{$item.id}}"><span id="hide-comments-total-{{$item.id}}" class="hide-comments-total">{{$item.total_comments_num}} {{$item.total_comments_text}}</span></a>
index c38991f52a09c5ceb03be12ef6281e4c371d2653..a03d0f2a64e4be3a89e0df08cfe4884a24f82e28 100644 (file)
@@ -8,7 +8,7 @@
                                <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="return" value="{{$return_path}}" />-->*}}
                                <input type="hidden" name="jsreload" value="{{$jsreload}}" />
                                <input type="hidden" name="preview" id="comment-preview-inp-{{$id}}" value="0" />
 
index 8143a82808e61794c8884d06b8cb155e4215ce5f..8e0e1acc7fd3a1adc124419fb17e95ad0a46eea6 100644 (file)
                        <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}}
+                                               {{foreach $contact.photo_menu as $c}}
+                                               {{if $c.2}}
+                                               <li><a target="redir" href="{{$c.1}}">{{$c.0}}</a></li>
+                                               {{else}}
+                                               <li><a href="{{$c.1}}">{{$c.0}}</a></li>
+                                               {{/if}}
+                                               {{/foreach}}
                     </ul>
                 </div>
                        {{/if}}
index 136ed2d36fc06329b8f515e0a1ba34c42e0de3dc..b30aede3dac62747a30582d75999fca613346abd 100644 (file)
@@ -8,7 +8,7 @@
                                <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="return" value="{{$return_path}}" />-->*}}
                                <input type="hidden" name="jsreload" value="{{$jsreload}}" />
                                <input type="hidden" name="preview" id="comment-preview-inp-{{$id}}" value="0" />
                                <input type="hidden" name="post_id_random" value="{{$rand_num}}" />
index 800e19b1425a43f207c1dd585f9f96798a43e9b7..d22acd5a6beeb35ed6c1d8c6c33cd9cc47459398 100644 (file)
                        <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}}
+                                               {{foreach $contact.photo_menu as $c}}
+                                               {{if $c.2}}
+                                               <li><a target="redir" href="{{$c.1}}">{{$c.0}}</a></li>
+                                               {{else}}
+                                               <li><a href="{{$c.1}}">{{$c.0}}</a></li>
+                                               {{/if}}
+                                               {{/foreach}}
                     </ul>
                 </div>
                        {{/if}}
index edf19395b4af3d71308b093222de5ee66d016b88..f4655078dd6b078b90d8ec97d88e21b045392197 100644 (file)
@@ -12,7 +12,7 @@
                                <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="return" value="{{$return_path}}" />-->*}}
                                <input type="hidden" name="jsreload" value="{{$jsreload}}" />
                                <input type="hidden" name="preview" id="comment-preview-inp-{{$id}}" value="0" />
                                <input type="hidden" name="post_id_random" value="{{$rand_num}}" />
index 9a0efdc233869482fba290c2a77f56d1e7b7e988..50bbd89e49724ffc8316e564efec9b69aab16fbc 100644 (file)
@@ -8,7 +8,7 @@
                                <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="return" value="{{$return_path}}" />-->*}}
                                <input type="hidden" name="jsreload" value="{{$jsreload}}" />
                                <input type="hidden" name="preview" id="comment-preview-inp-{{$id}}" value="0" />
                                <input type="hidden" name="post_id_random" value="{{$rand_num}}" />
index a5baa14a3d25636d0a306069bb38c67814e074e5..1b22ea9c6ebd833d74dd46a146b7991f51b56143 100644 (file)
@@ -3,7 +3,7 @@
  *     DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
  *
  *}}
-<!--           <script>
+{{*<!--                <script>
                $(document).ready( function () {
                        $(document).mouseup(function(e) {
                                var container = $("#comment-edit-wrapper-{{$id}}");
                                }
                        });
                });
-               </script>-->
+               </script>-->*}}
 
                <div class="comment-wwedit-wrapper {{$indent}}" id="comment-edit-wrapper-{{$id}}" style="display: block;" >
                        <form class="comment-edit-form {{$indent}}" id="comment-edit-form-{{$id}}" action="item" method="post" onsubmit="post_comment({{$id}}); return false;" >
-<!--                   <span id="hide-commentbox-{{$id}}" class="hide-commentbox fakelink" onclick="showHideCommentBox({{$id}});">{{$comment}}</span>
-                       <form class="comment-edit-form" style="display: none;" id="comment-edit-form-{{$id}}" action="item" method="post" onsubmit="post_comment({{$id}}); return false;">-->
+{{*<!--                        <span id="hide-commentbox-{{$id}}" class="hide-commentbox fakelink" onclick="showHideCommentBox({{$id}});">{{$comment}}</span>
+                       <form class="comment-edit-form" style="display: none;" id="comment-edit-form-{{$id}}" action="item" method="post" onsubmit="post_comment({{$id}}); return false;">-->*}}
                                <input type="hidden" name="type" value="{{$type}}" />
                                <input type="hidden" name="source" value="{{$sourceapp}}" />
                                <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="return" value="{{$return_path}}" />-->*}}
                                <input type="hidden" name="jsreload" value="{{$jsreload}}" />
                                <input type="hidden" name="preview" id="comment-preview-inp-{{$id}}" value="0" />
                                <input type="hidden" name="post_id_random" value="{{$rand_num}}" />
 
-                               <!--<div class="comment-edit-photo" id="comment-edit-photo-{{$id}}" >-->
+                               {{*<!--<div class="comment-edit-photo" id="comment-edit-photo-{{$id}}" >-->*}}
                                        <a class="comment-edit-photo comment-edit-photo-link" id="comment-edit-photo-{{$id}}" href="{{$mylink}}" title="{{$mytitle}}"><img class="my-comment-photo" src="{{$myphoto}}" alt="{{$mytitle}}" title="{{$mytitle}}" /></a>
-                               <!--</div>-->
-                               <!--<div class="comment-edit-photo-end"></div>-->
+                               {{*<!--</div>-->*}}
+                               {{*<!--<div class="comment-edit-photo-end"></div>-->*}}
                                <ul class="comment-edit-bb-{{$id}}">
                                        <li><a class="editicon boldbb shadow"
                                                style="cursor: pointer;" title="{{$edbold}}"
@@ -48,7 +48,7 @@
                                        <li><a class="editicon codebb shadow"
                                                style="cursor: pointer;" title="{{$edcode}}"
                                                onclick="insertFormatting('{{$comment}}','code', {{$id}});"></a></li>
-<!--                                   <li><a class="editicon imagebb shadow"
+{{*<!--                                        <li><a class="editicon imagebb shadow"
                                                style="cursor: pointer;" title="{{$edimg}}"
                                                onclick="insertFormatting('{{$comment}}','img', {{$id}});"></a></li>
                                        <li><a class="editicon urlbb shadow"
                                                onclick="insertFormatting('{{$comment}}','url', {{$id}});"></a></li>
                                        <li><a class="editicon videobb shadow"
                                                style="cursor: pointer;" title="{{$edvideo}}"
-                                               onclick="insertFormatting('{{$comment}}','video', {{$id}});"></a></li>-->
+                                               onclick="insertFormatting('{{$comment}}','video', {{$id}});"></a></li>-->*}}
                                </ul>   
-                               <!--<div class="comment-edit-bb-end"></div>-->
-<!--                           <textarea id="comment-edit-text-{{$id}}" class="comment-edit-text-empty" name="body" onFocus="commentOpen(this,{{$id}});cmtBbOpen({{$id}});" onBlur="commentClose(this,{{$id}});cmtBbClose({{$id}});" >{{$comment}}</textarea>-->
+                               {{*<!--<div class="comment-edit-bb-end"></div>-->*}}
+{{*<!--                                <textarea id="comment-edit-text-{{$id}}" class="comment-edit-text-empty" name="body" onFocus="commentOpen(this,{{$id}});cmtBbOpen({{$id}});" onBlur="commentClose(this,{{$id}});cmtBbClose({{$id}});" >{{$comment}}</textarea>-->*}}
                                <textarea id="comment-edit-text-{{$id}}" class="comment-edit-text-empty" name="body" onFocus="commentOpen(this,{{$id}});cmtBbOpen({{$id}});" >{{$comment}}</textarea>
                                {{if $qcomment}}
                                        <select id="qcomment-select-{{$id}}" name="qcomment-{{$id}}" class="qcomment" onchange="qCommentInsert(this,{{$id}});" >
                                <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="preview-link fakelink">{{$preview}}</span>
-                                       <div id="comment-edit-preview-{{$id}}" class="comment-edit-preview" style="display:none;"></div>-->
+                                       {{*<!--<span onclick="preview_comment({{$id}});" id="comment-edit-preview-link-{{$id}}" class="preview-link fakelink">{{$preview}}</span>
+                                       <div id="comment-edit-preview-{{$id}}" class="comment-edit-preview" style="display:none;"></div>-->*}}
                                </div>
 
-                               <!--<div class="comment-edit-end"></div>-->
+                               {{*<!--<div class="comment-edit-end"></div>-->*}}
                        </form>
 
                </div>
index 2f903f494dfc26cbe9fbd6529d8362281ab312ff..7d257dabccd7c590b19b4ff8b3f01a65e2abf682 100644 (file)
                onmouseover="if (typeof t{{$contact.id}} != 'undefined') clearTimeout(t{{$contact.id}});" 
                onmouseout="t{{$contact.id}}=setTimeout('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>-->
+{{*<!--                        <a href="{{$contact.url}}" title="{{$contact.img_hover}}" /><img src="{{$contact.thumb}}" {{$contact.sparkle}} alt="{{$contact.name}}" /></a>-->*}}
                        <span onclick="openClose('contact-photo-menu-{{$contact.id}}');" class="fakelink contact-photo-menu-button" id="contact-photo-menu-button-{{$contact.id}}">
                        <img src="{{$contact.thumb}}" {{$contact.sparkle}} alt="{{$contact.name}}" />
                        </span>
 
                        {{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>-->
+{{*<!--                        <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}}
+                                               {{foreach $contact.photo_menu as $c}}
+                                               {{if $c.2}}
+                                               <li><a target="redir" href="{{$c.1}}">{{$c.0}}</a></li>
+                                               {{else}}
+                                               <li><a href="{{$c.1}}">{{$c.0}}</a></li>
+                                               {{/if}}
+                                               {{/foreach}}
                     </ul>
                 </div>
                        {{/if}}
index 0c4a26077b962ed832ccc30527006f174cbf06d6..d0b5135cb7813059c5409e3f281e8656e780182d 100644 (file)
@@ -23,6 +23,8 @@
        </div>
        <div id="photos-upload-exist-end"></div>
 
+       {{$default_upload_box}}
+
        <div id="photos-upload-noshare-div" class="photos-upload-noshare-div" >
                <input id="photos-upload-noshare" type="checkbox" name="not_visible" value="1" checked />
                <label id="photos-upload-noshare-text" for="photos-upload-noshare" >{{$nosharetext}}</label>
@@ -44,9 +46,9 @@
 
        <div id="photos-upload-spacer"></div>
 
-       {{$uploader}}
+       {{$alt_uploader}}
 
-       {{$default}}
+       {{$default_upload_submit}}
 
        <div class="photos-upload-end" ></div>
 </form>
index 2f341072a005d1724bf46faaec6606c26cf8b21b..4b18abce2ec55adcc0e1e7149b14d94d14ab8a3b 100644 (file)
@@ -3,7 +3,7 @@
  *     DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN
  *
  *}}
-<!--           <script>
+{{*<!--                <script>
                $(document).ready( function () {
                        $(document).mouseup(function(e) {
                                var container = $("#comment-edit-wrapper-{{$id}}");
                                }
                        });
                });
-               </script>-->
+               </script>-->*}}
 
                <div class="comment-wwedit-wrapper {{$indent}}" 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;">
-<!--                   <span id="hide-commentbox-{{$id}}" class="hide-commentbox fakelink" onclick="showHideCommentBox({{$id}});">{{$comment}}</span>
-                       <form class="comment-edit-form" style="display: none;" id="comment-edit-form-{{$id}}" action="item" method="post" onsubmit="post_comment({{$id}}); return false;">-->
+{{*<!--                        <span id="hide-commentbox-{{$id}}" class="hide-commentbox fakelink" onclick="showHideCommentBox({{$id}});">{{$comment}}</span>
+                       <form class="comment-edit-form" style="display: none;" id="comment-edit-form-{{$id}}" action="item" method="post" onsubmit="post_comment({{$id}}); return false;">-->*}}
                                <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="return" value="{{$return_path}}" />-->*}}
                                <input type="hidden" name="jsreload" value="{{$jsreload}}" />
                                <input type="hidden" name="preview" id="comment-preview-inp-{{$id}}" value="0" />
                                <input type="hidden" name="post_id_random" value="{{$rand_num}}" />
 
-<!--                           <div class="comment-edit-photo" id="comment-edit-photo-{{$id}}" >-->
+{{*<!--                                <div class="comment-edit-photo" id="comment-edit-photo-{{$id}}" >-->*}}
                                        <a class="comment-edit-photo comment-edit-photo-link" id="comment-edit-photo-{{$id}}" href="{{$mylink}}" title="{{$mytitle}}"><img class="my-comment-photo" src="{{$myphoto}}" alt="{{$mytitle}}" title="{{$mytitle}}" /></a>
-<!--                           </div>-->
-                               <!--<div class="comment-edit-photo-end"></div>-->
+{{*<!--                                </div>-->*}}
+                               {{*<!--<div class="comment-edit-photo-end"></div>-->*}}
                                <ul class="comment-edit-bb" id="comment-edit-bb-{{$id}}">
                                        <li><a class="editicon boldbb shadow"
                                                style="cursor: pointer;" title="{{$edbold}}"
@@ -57,8 +57,8 @@
                                                style="cursor: pointer;" title="{{$edvideo}}"
                                                onclick="insertFormatting('{{$comment}}','video', {{$id}});"></a></li>
                                </ul>   
-<!--                           <div class="comment-edit-bb-end"></div>-->
-<!--                           <textarea id="comment-edit-text-{{$id}}" class="comment-edit-text-empty" name="body" onFocus="commentOpen(this,{{$id}});cmtBbOpen({{$id}});" onBlur="commentClose(this,{{$id}});cmtBbClose({{$id}});" >{{$comment}}</textarea>-->
+{{*<!--                                <div class="comment-edit-bb-end"></div>-->*}}
+{{*<!--                                <textarea id="comment-edit-text-{{$id}}" class="comment-edit-text-empty" name="body" onFocus="commentOpen(this,{{$id}});cmtBbOpen({{$id}});" onBlur="commentClose(this,{{$id}});cmtBbClose({{$id}});" >{{$comment}}</textarea>-->*}}
                                <textarea id="comment-edit-text-{{$id}}" class="comment-edit-text-empty" name="body" onFocus="commentOpen(this,{{$id}});cmtBbOpen({{$id}});" >{{$comment}}</textarea>
                                {{if $qcomment}}
                                        <select id="qcomment-select-{{$id}}" name="qcomment-{{$id}}" class="qcomment" onchange="qCommentInsert(this,{{$id}});" >
@@ -76,7 +76,7 @@
                                        <div id="comment-edit-preview-{{$id}}" class="comment-edit-preview" style="display:none;"></div>
                                </div>
 
-                               <!--<div class="comment-edit-end"></div>-->
+                               {{*<!--<div class="comment-edit-end"></div>-->*}}
                        </form>
 
                </div>
index 649829606cd7b64ee2a06d278742cf6ee672c443..7eba7efeeeab7010776a6a7978656e12c673326d 100644 (file)
                        <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}}
+                                               {{foreach $contact.photo_menu as $c}}
+                                               {{if $c.2}}
+                                               <li><a target="redir" href="{{$c.1}}">{{$c.0}}</a></li>
+                                               {{else}}
+                                               <li><a href="{{$c.1}}">{{$c.0}}</a></li>
+                                               {{/if}}
+                                               {{/foreach}}
                     </ul>
                 </div>
                        {{/if}}
index 233672a3123fd8c240e28b66c38676c699d9d97b..4c829a2962768d2cdd85f7791668c5e5839e1f88 100644 (file)
@@ -24,6 +24,7 @@
        <div id="photos-upload-exist-end"></div>
 
        <div id="photos-upload-choosefile-outer-wrapper">
+       {{$default_upload_box}}
        <div id="photos-upload-noshare-div" class="photos-upload-noshare-div" >
                <input id="photos-upload-noshare" type="checkbox" name="not_visible" value="1" checked />
                <div id="photos-upload-noshare-label">
@@ -46,9 +47,9 @@
 
        <div id="photos-upload-spacer"></div>
 
-       {{$uploader}}
+       {{$alt_uploader}}
 
-       {{$default}}
+       {{$default_upload_submit}}
 
        <div class="photos-upload-end" ></div>
        </div>
index 1e6a6e69c4244830df9bd6457f8b666e0aa45988..eca1f14f405b7717eb314dabab8d3aa55772e4b2 100644 (file)
@@ -8,7 +8,7 @@
                                <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="return" value="{{$return_path}}" />-->*}}
                                <input type="hidden" name="jsreload" value="{{$jsreload}}" />
                                <input type="hidden" name="preview" id="comment-preview-inp-{{$id}}" value="0" />
                                <input type="hidden" name="post_id_random" value="{{$rand_num}}" />
index 9788388e7641353fcb17f82e2c08fdb9f3e622bd..c74a513b8fc1e4a7a50900b7ed5e8b85931815a2 100644 (file)
                        {{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}}
+                               {{foreach $contact.photo_menu as $c}}
+                               {{if $c.2}}
+                               <li><a target="redir" href="{{$c.1}}">{{$c.0}}</a></li>
+                               {{else}}
+                               <li><a href="{{$c.1}}">{{$c.0}}</a></li>
+                               {{/if}}
+                               {{/foreach}}
                        </ul>
                        {{/if}}
                </div>
index 95ea5afd75b6f9c916b2825dafe8e1048004eae8..ef993e8f535d9e24dbd4bac24f123c54ee95cdb9 100644 (file)
@@ -8,7 +8,7 @@
                                <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="return" value="{{$return_path}}" />-->*}}
                                <input type="hidden" name="jsreload" value="{{$jsreload}}" />
                                <input type="hidden" name="preview" id="comment-preview-inp-{{$id}}" value="0" />
                                <input type="hidden" name="post_id_random" value="{{$rand_num}}" />
index 45b3c6891b2f19a775d2e9f51d70f3c8f3fe7d6c..b683f12424ef4d346b721d4c03b37cfe2ee5d591 100644 (file)
@@ -12,7 +12,7 @@
                                <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="return" value="{{$return_path}}" />-->*}}
                                <input type="hidden" name="jsreload" value="{{$jsreload}}" />
                                <input type="hidden" name="preview" id="comment-preview-inp-{{$id}}" value="0" />
                                <input type="hidden" name="post_id_random" value="{{$rand_num}}" />