feature 2108 added: user upload removed from core. It will come back as a

"new generation" user upload in the Community plugin.


git-svn-id: http://piwigo.org/svn/trunk@8651 68402e56-0260-453c-a942-63ccdbb3a9ee

5 files changed, 0 insertions, 89 deletions

diff --git a/admin/themes/default/template/admin.tpl b/admin/themes/default/template/admin.tpl
index 415fbe3ee..43e9d7105 100644
--- a/admin/themes/default/template/admin.tpl
+++ b/admin/themes/default/template/admin.tpl
@@ -18,9 +18,6 @@ jQuery(document).ready(function(){ldelim}
     <dd>
       <ul>
         <li><a href="{$U_ADD_PHOTOS}">{'Add'|@translate}</a></li>
-{if $ENABLE_SYNCHRONIZATION}
-        <li><a href="{$U_WAITING}">{'Waiting'|@translate}</a></li>
-{/if}
         <li><a href="{$U_RATING}">{'Rating'|@translate}</a></li>
         <li><a href="{$U_TAGS}">{'Tags'|@translate}</a></li>
         <li><a href="{$U_CADDIE}">{'Caddie'|@translate}</a></li>
diff --git a/admin/themes/default/template/cat_modify.tpl b/admin/themes/default/template/cat_modify.tpl
index d3fd98c1c..6fe92a6f5 100644
--- a/admin/themes/default/template/cat_modify.tpl
+++ b/admin/themes/default/template/cat_modify.tpl
@@ -85,14 +85,6 @@
         {html_radios name='commentable' values='false,true'|@explode output='No,Yes'|@explode|translate selected=$CAT_COMMENTABLE}
       </td>
     </tr>
-    {if isset($SHOW_UPLOADABLE) }
-    <tr>
-      <td><strong>{'Authorize upload'|@translate}</strong>
-      <td>
-        {html_radios name='uploadable' values='false,true'|@explode output='No,Yes'|@explode|translate selected=$CAT_UPLOADABLE}
-      </td>
-    </tr>
-    {/if}
   </table>
 </fieldset>
 
diff --git a/admin/themes/default/template/configuration.tpl b/admin/themes/default/template/configuration.tpl
index 903255baf..8d8395206 100644
--- a/admin/themes/default/template/configuration.tpl
+++ b/admin/themes/default/template/configuration.tpl
@@ -187,29 +187,6 @@
 </fieldset>
 {/if}
 
-{if isset($upload)}
-<fieldset id="uploadConf">
-  <legend></legend>
-  <ul>
-    <li>
-      <label><span class="property">{'Show upload link every time'|@translate}</span>
-      <input type="checkbox" name="upload_link_everytime" {if ($upload.upload_link_everytime)}checked="checked"{/if}></label>
-    </li>
-    <li>
-      <label><span class="property">{'User access level to upload'|@translate}</span>
-      {html_options name="upload_user_access" options=$upload.upload_user_access_options selected=$upload.upload_user_access_options_selected}
-      </label>
-    </li>
-    <li>
-      <label>
-        <span class="property">{'Email admins when a picture is uploaded'|@translate}</span>
-        <input type="checkbox" name="email_admin_on_picture_uploaded" {if ($upload.email_admin_on_picture_uploaded)}checked="checked"{/if}>
-      </label>
-    </li>
-  </ul>
-</fieldset>
-{/if}
-
 </div> <!-- configContent -->
 
 {if isset($default)}
diff --git a/admin/themes/default/template/intro.tpl b/admin/themes/default/template/intro.tpl
index b3dbfbbac..81d1d163f 100644
--- a/admin/themes/default/template/intro.tpl
+++ b/admin/themes/default/template/intro.tpl
@@ -37,10 +37,6 @@ jQuery().ready(function(){ldelim}
     <ul>
       <li>
         {$DB_ELEMENTS}
-        {if isset($waiting)}
-        (<a href="{$waiting.URL}">{$waiting.INFO}</a>)
-        {/if}
-
         {if isset($first_added)}
         ({$first_added.DB_DATE})
         {/if}
diff --git a/admin/themes/default/template/upload.tpl b/admin/themes/default/template/upload.tpl
deleted file mode 100644
index 44578c715..000000000
--- a/admin/themes/default/template/upload.tpl
+++ /dev/null
@@ -1,51 +0,0 @@
-<div class="titrePage">
-  <h2>{'Waiting'|@translate} {$TABSHEET_TITLE}</h2>
-</div>
-
-<h3>{'Pictures waiting for validation'|@translate}</h3>
-
-<form action="{$F_ACTION}" method="post" id="waiting">
-  <table style="width:99%;" >
-    <tr class="throw">
-      <td style="width:20%;">{'Album'|@translate}</td>
-      <td style="width:20%;">{'Date'|@translate}</td>
-      <td style="width:20%;">{'File'|@translate}</td>
-      <td style="width:20%;">{'Thumbnail'|@translate}</td>
-      <td style="width:20%;">{'Author'|@translate}</td>
-      <td style="width:1px;">&nbsp;</td>
-    </tr>
-    
-    {if not empty($pictures) }
-    {foreach from=$pictures item=picture name=picture_loop}
-    <tr class="{if $smarty.foreach.picture_loop.index is odd}row1{else}row2{/if}">
-      <td style="white-space:nowrap;">{$picture.CATEGORY_IMG}</td>
-      <td style="white-space:nowrap;">{$picture.DATE_IMG}</td>
-      <td style="white-space:nowrap;">
-        <a href="{$picture.PREVIEW_URL_IMG}" title="{$picture.FILE_TITLE}">{$picture.FILE_IMG}</a>
-      </td>
-      <td style="white-space:nowrap;">
-        {if not empty($picture.thumbnail) }
-        <a href="{$picture.thumbnail.PREVIEW_URL_TN_IMG}" title="{$picture.thumbnail.FILE_TN_TITLE}">{$picture.thumbnail.FILE_TN_IMG}</a>
-        {/if}
-      </td>
-      <td style="white-space:nowrap;">
-        <a href="mailto:{$picture.UPLOAD_EMAIL}">{$picture.UPLOAD_USERNAME}</a>
-      </td>
-      <td style="white-space:nowrap;">
-        <label><input type="radio" name="action-{$picture.ID_IMG}" value="validate"> {'Validate'|@translate}</label>
-        <label><input type="radio" name="action-{$picture.ID_IMG}" value="reject"> {'Reject'|@translate}</label>
-      </td>
-    </tr>
-    {/foreach}
-    {/if}
-  </table>
-
-  <p class="bottomButtons">
-    <input type="hidden" name="list" value="{$LIST}">
-    <input class="submit" type="submit" name="submit" value="{'Submit'|@translate}">
-    <input class="submit" type="submit" name="validate-all" value="{'Validate All'|@translate}">
-    <input class="submit" type="submit" name="reject-all" value="{'Reject All'|@translate}">
-    <input class="submit" type="reset" value="{'Reset'|@translate}">
-  </p>
-
-</form>