Changeset 6361 for branches

Timestamp:

May 26, 2010, 12:29:31 AM (14 years ago)

Author:

plg

Message:

feature 1697: ability to deactivate the synchronization method to add photos.

Location:

branches/2.1

Files:

• admin.php (modified) (1 diff)
• admin/cat_options.php (modified) (1 diff)
• admin/configuration.php (modified) (1 diff)
• admin/help.php (modified) (1 diff)
• admin/photos_add.php (modified) (1 diff)
• admin/themes/default/template/admin.tpl (modified) (2 diffs)
• admin/themes/default/template/element_set_global.tpl (modified) (1 diff)
• admin/themes/default/template/footer.tpl (modified) (1 diff)
• admin/themes/default/template/intro.tpl (modified) (2 diffs)
• include/config_default.inc.php (modified) (1 diff)
• language/cs_CZ/help/help_add_photos.html (modified) (2 diffs)
• language/de_DE/help/help_add_photos.html (modified) (2 diffs)
• language/en_UK/help/help_add_photos.html (modified) (2 diffs)
• language/es_ES/help/help_add_photos.html (modified) (2 diffs)
• language/fr_FR/help/help_add_photos.html (modified) (2 diffs)
• language/hr_HR/help/help_add_photos.html (modified) (2 diffs)
• language/hu_HU/help/help_add_photos.html (modified) (2 diffs)
• language/it_IT/help/help_add_photos.html (modified) (2 diffs)
• language/ja_JP/help/help_add_photos.html (modified) (2 diffs)
• language/nl_NL/help/help_add_photos.html (modified) (2 diffs)
• language/pl_PL/help/help_add_photos.html (modified) (2 diffs)
• language/ru_RU/help/help_add_photos.html (modified) (2 diffs)
• language/sr_RS/help/help_add_photos.html (modified) (2 diffs)
• language/zh_CN/help/help_add_photos.html (modified) (2 diffs)

branches/2.1/admin.php

@@ -103 +103 @@
   array(
     'USERNAME' => $user['username'],
+    'ENABLE_SYNCHRONIZATION' => $conf['enable_synchronization'],
     'U_SITE_MANAGER'=> $link_start.'site_manager',
     'U_HISTORY_STAT'=> $link_start.'stats',

branches/2.1/admin/cat_options.php

@@ -163 +163 @@
 $tabsheet->add('status', l10n('Public / Private'), $opt_link.'status');
 $tabsheet->add('visible', l10n('Lock'), $opt_link.'visible');
-$tabsheet->add('upload', l10n('Upload'), $opt_link.'upload');
+if ($conf['enable_synchronization'])
+{
+  $tabsheet->add('upload', l10n('Upload'), $opt_link.'upload');
+}
 $tabsheet->add('comments', l10n('Comments'), $opt_link.'comments');
 if ($conf['allow_random_representative'])

branches/2.1/admin/configuration.php

@@ -222 +222 @@
 $tabsheet->add('history', l10n('History'), $conf_link.'history');
 $tabsheet->add('comments', l10n('Comments'), $conf_link.'comments');
-$tabsheet->add('upload', l10n('Upload'), $conf_link.'upload');
+if ($conf['enable_synchronization'])
+{
+  $tabsheet->add('upload', l10n('Upload'), $conf_link.'upload');
+}
 $tabsheet->add('default', l10n('Guest Settings'), $conf_link.'default');
 // TabSheet selection

branches/2.1/admin/help.php

@@ -34 +34 @@
 $help_section_title = null;
 
-$tabs = array(
-  array(
-    'code' => 'add_photos',
-    'label' => l10n('Add Photos'),
-    ),
-  array(
-    'code' => 'permissions',
-    'label' => l10n('Permissions'),
-    ),
-  array(
-    'code' => 'groups',
-    'label' => l10n('Groups'),
-    ),
-  array(
+$tabs = array();
+$tabs[] = array(
+  'code' => 'add_photos',
+  'label' => l10n('Add Photos'),
+  );
+$tabs[] = array(
+  'code' => 'permissions',
+  'label' => l10n('Permissions'),
+  );
+$tabs[] = array(
+  'code' => 'groups',
+  'label' => l10n('Groups'),
+  );
+if ($conf['enable_synchronization'])
+{
+  $tabs[] = array(
     'code' => 'user_upload',
     'label' => l10n('User Upload'),
-    ),
-  array(
-    'code' => 'virtual_links',
-    'label' => l10n('Virtual Links'),
-    ),
-  array(
-    'code' => 'misc',
-    'label' => l10n('Miscellaneous'),
-    ),
+    );
+}
+$tabs[] = array(
+  'code' => 'virtual_links',
+  'label' => l10n('Virtual Links'),
+  );
+$tabs[] = array(
+  'code' => 'misc',
+  'label' => l10n('Miscellaneous'),
   );
 

branches/2.1/admin/photos_add.php

@@ -153 +153 @@
     'label' => l10n('Piwigo Uploader'),
     ),
-  array(
-    'code' => 'ftp',
-    'label' => l10n('FTP + Synchronization'),
-    ),
-  );
+  );
+
+if ($conf['enable_synchronization'])
+{
+  array_push(
+    $tabs,
+    array(
+      'code' => 'ftp',
+      'label' => l10n('FTP + Synchronization'),
+      )
+    );
+}
 
 $tab_codes = array_map(

branches/2.1/admin/themes/default/template/admin.tpl

@@ -20 +20 @@
       <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>
@@ -69 +71 @@
     <dd>
       <ul>
+{if $ENABLE_SYNCHRONIZATION}
         <li><a href="{$U_CAT_UPDATE}">{'Synchronize'|@translate}</a></li>
         <li><a href="{$U_SITE_MANAGER}">{'Site manager'|@translate}</a></li>
+{/if}
         <li><a href="{$U_HISTORY_STAT}">{'History'|@translate}</a></li>
+{if $ENABLE_SYNCHRONIZATION}
         <li><a href="{$U_THUMBNAILS}">{'Thumbnails'|@translate}</a></li>
+{/if}
         <li><a href="{$U_MAINTENANCE}">{'Maintenance'|@translate}</a></li>
         <li><a href="{$U_PENDING_COMMENTS}">{'Pending Comments'|@translate}</a></li>

branches/2.1/admin/themes/default/template/element_set_global.tpl

@@ -86 +86 @@
   <fieldset>
     <legend>{'Deletions'|@translate}</legend>
+{if $ENABLE_SYNCHRONIZATION}
     <p style="font-style:italic">{'Note: photo deletion does not apply to photos added by synchronization. For photos added by synchronization, remove them from the filesystem and then perform another synchronization.'|@translate}</p>
+{/if}
     <p>
       {'target'|@translate}

branches/2.1/admin/themes/default/template/footer.tpl

@@ -62 +62 @@
 {/literal}
 
+{if not $ENABLE_SYNCHRONIZATION}
+{literal}
+<script type='text/javascript'>
+  $(document).ready(function() {
+    $("#helpSynchro").hide();
+  });
+</script>
+{/literal}
+{/if}
+
 </body>
 </html>

branches/2.1/admin/themes/default/template/intro.tpl

@@ -60 +60 @@
 </dl>
 
-
+{if $ENABLE_SYNCHRONIZATION}
 <form name="QuickSynchro" action="{$U_CAT_UPDATE}" method="post" id="QuickSynchro" style="display: block; text-align:right;">
 <div>
@@ -76 +76 @@
 </div>
 </form>
+{/if}

branches/2.1/include/config_default.inc.php

@@ -781 +781 @@
 // pLoader direct download url for linux
 $conf['ploader_download_linux'] = 'http://piwigo.org/ext/download.php?eid=269';
+
+// enable the synchronization method for adding photos
+$conf['enable_synchronization'] = true;
 ?>

branches/2.1/language/cs_CZ/help/help_add_photos.html

@@ -14 +14 @@
 <p class="nextStepLink"><a href="admin.php?page=photos_add&section=ploader">Přejděte na pLoader</a></p>
 
+<div id="helpSynchro">
 <ul>
   <li><strong>FTP přenos</strong> je nejvíce doporučená cesta, jak nahrát velké množství fotografií s minimálním úsilím. Následujte návod, jak připravit Vaše fotografie. Tato metoda Vám dává možnost přesně řídit uspořádání Vašich fotografií na Vašem serveru.</li>
@@ -19 +20 @@
 
 <p class="nextStepLink"><a href="admin.php?page=photos_add&section=ftp">Přejděte na FTP přenos</a></p>
+</div>

branches/2.1/language/de_DE/help/help_add_photos.html

@@ -16 +16 @@
 <p class="nextStepLink"><a href="admin.php?page=photos_add&section=ploader">Zum Piwigo Uploader</a></p>
 
+<div id="helpSynchro">
 <ul>
   <li><strong>FTP Upload</strong> ist die empfohlene Methode, um große Mengen
@@ -25 +26 @@
 
 <p class="nextStepLink"><a href="admin.php?page=photos_add&section=ftp">Zum FTP Upload</a></p>
+</div>

branches/2.1/language/en_UK/help/help_add_photos.html

@@ -16 +16 @@
 <p class="nextStepLink"><a href="admin.php?page=photos_add&section=ploader">Go to pLoader</a></p>
 
+<div id="helpSynchro">
 <ul>
   <li><strong>FTP transfer</strong> is the most recommended way to add a
@@ -24 +25 @@
 
 <p class="nextStepLink"><a href="admin.php?page=photos_add&section=ftp">Go to FTP</a></p>
+</div>

branches/2.1/language/es_ES/help/help_add_photos.html

@@ -18 +18 @@
 <p class="nextStepLink"><a href="admin.php?page=photos_add&section=ploader">Utilizar pLoader</a></p>
 
+<div id="helpSynchro">
 <ul>
   <li><strong>El FTP</strong> es el método ideal para añadir una colección importante en un mínimo de operaciones.
@@ -24 +25 @@
 
 <p class="nextStepLink"><a href="admin.php?page=photos_add&section=ftp">Utilizar FTP</a></p>
+</div>

branches/2.1/language/fr_FR/help/help_add_photos.html

@@ -21 +21 @@
 <p class="nextStepLink"><a href="admin.php?page=photos_add&section=ploader">Utiliser pLoader</a></p>
 
+<div id="helpSynchro">
 <ul>
   <li><strong>Le transfert FTP</strong>
@@ -30 +31 @@
 
 <p class="nextStepLink"><a href="admin.php?page=photos_add&section=ftp">Utiliser FTP</a></p>
+</div>

branches/2.1/language/hr_HR/help/help_add_photos.html

@@ -16 +16 @@
 <p class="nextStepLink"><a href="admin.php?page=photos_add&section=ploader">Go to pLoader</a></p>
 
+<div id="helpSynchro">
 <ul>
 <li><strong>FTP transfer</strong> is the most recommended way to add a
@@ -24 +25 @@
 
 <p class="nextStepLink"><a href="admin.php?page=photos_add&section=ftp">Go to FTP</a></p>
+</div>

branches/2.1/language/hu_HU/help/help_add_photos.html

@@ -13 +13 @@
 <p class="nextStepLink"><a href="admin.php?page=photos_add&section=ploader">Tovább a pLoader beszerzéséhez</a></p>
 
+<div id="helpSynchro">
 <ul>
   <li>Nagy mennyiségű képek minimális munkával történő hozzáadásának legegyszerűbb módja a <strong>Feltöltés FTP-n keresztül</strong>. Feltöltés előtt el kell végezni a képek előkészítését. Az FTP módszer használata esetén a képek helyének előkészítését kézzel kell elvégezni a tárhelyen lévő könyvtárstruktúra kialakításával.</li>
@@ -18 +19 @@
 
 <p class="nextStepLink"><a href="admin.php?page=photos_add&section=ftp">Tovább az FTP feltöltést bemutató oldalra</a></p>
+</div>

branches/2.1/language/it_IT/help/help_add_photos.html

@@ -21 +21 @@
 <p class="nextStepLink"><a href="admin.php?page=photos_add&section=ploader">Utilizzare pLoader</a></p>
 
+<div id="helpSynchro">
 <ul>
   <li><strong>FTP</strong>
@@ -29 +30 @@
 
 <p class="nextStepLink"><a href="admin.php?page=photos_add&section=ftp">Utilizzare FTP</a></p>
+</div>

branches/2.1/language/ja_JP/help/help_add_photos.html

@@ -13 +13 @@
 <p class="nextStepLink"><a href="admin.php?page=photos_add&section=ploader">pLoaderへ</a></p>
 
+<div id="helpSynchro">
 <ul>
   <li>多数の写真をアップロードする場合、<strong>FTP</strong> は推薦しています。写真をアップロードするために、ガイドをお読みください。ＦＴＰの方法はサーバー上に写真の場所を正確に指定することができます。</li>
@@ -18 +19 @@
 
 <p class="nextStepLink"><a href="admin.php?page=photos_add&section=ftp">ＦＴＰへ</a></p>
+</div>

branches/2.1/language/nl_NL/help/help_add_photos.html

@@ -15 +15 @@
 <p class="nextStepLink"><a href="admin.php?page=photos_add&section=ploader">Ga naar pLoader</a></p>
 
+<div id="helpSynchro">
 <ul>
   <li><strong>FTP overdracht</strong> is de meest geschikte nainier om een grote hoeveelheid fotos toe te voegen met zo min mogelijk handelingen. Volg de aanwijzingen om je fotos voor te bereiden. De FTP manier is laat je precies de indeling van je fotos op de server bepalen.</li>
@@ -20 +21 @@
 
 <p class="nextStepLink"><a href="admin.php?page=photos_add&section=ftp">Ga naar FTP</a></p>
+</div>

branches/2.1/language/pl_PL/help/help_add_photos.html

@@ -13 +13 @@
 <p class="nextStepLink"><a href="admin.php?page=photos_add&section=ploader">PrzejdŸ do pLoader</a></p>
 
+<div id="helpSynchro">
 <ul>
   <li><strong>Transfer FTP</strong> jest najbardziej rekomendowanym sposobem dodawania bardzo du¿ej iloœci zdjêæ przy pomocy niewielu klikniêæ. Skorzystaj z przewodnika aby przygotowaæ swoje zdjêcia. Metoda FTP umo¿liwia Ci bardzo dok³adn¹ kontrolê nad umiejscowieniem plików zdjêæ na serwerze.</li>
@@ -18 +19 @@
 
 <p class="nextStepLink"><a href="admin.php?page=photos_add&section=ftp">PrzejdŸ do FTP</a></p>
+</div>

branches/2.1/language/ru_RU/help/help_add_photos.html

@@ -14 +14 @@
 <p class="nextStepLink"><a href="admin.php?page=photos_add&section=ploader">Перейти к pLoader</a></p>
 
+<div id="helpSynchro">
 <ul>
  <li><strong>Загрузка по FTP</strong> – наиболее рекомендуемый способ загрузки очень большой коллекции фотографии при минимальном количестве кликов. Подготовьте фотографии, воспользовавшись инструкцией. Загрузка по FTP позволит вам организовать фотографии на сервере именно так, как нужно.</li>
@@ -19 +20 @@
 
 <p class="nextStepLink"><a href="admin.php?page=photos_add&section=ftp">Загрузка по FTP</a></p>
+</div>

branches/2.1/language/sr_RS/help/help_add_photos.html

@@ -15 +15 @@
 <p class="nextStepLink"><a href="admin.php?page=photos_add&section=ploader">Idi na pLoader</a></p>
 
+<div id="helpSynchro">
 <ul>
   <li><strong>FTP prenos</strong>je najčešće preporučen način da dodate
@@ -22 +23 @@
 
 <p class="nextStepLink"><a href="admin.php?page=photos_add&section=ftp">Idi na FTP</a></p>
+</div>

branches/2.1/language/zh_CN/help/help_add_photos.html

@@ -13 +13 @@
 <p class="nextStepLink"><a href="admin.php?page=photos_add&section=ploader">使用 pLoader</a></p>
 
+<div id="helpSynchro">
 <ul>
   <li><strong>FTP 上传</strong> 是非常推荐的方法，其可以一次性上传大批量的相片。以下向导将教您如何准备您的相片。使用 FTP 方式，您可以很精确地控制您服务器上的相片目录的物理结构。</li>
@@ -18 +19 @@
 
 <p class="nextStepLink"><a href="admin.php?page=photos_add&section=ftp">使用 FTP</a></p>
+</div>