Changeset 5741 for trunk/admin


Ignore:
Timestamp:
Apr 9, 2010, 8:17:50 PM (14 years ago)
Author:
plg
Message:

merge back r5740, I should have commited only the galleries directory

Location:
trunk/admin
Files:
2 edited

Legend:

Unmodified
Added
Removed

  • trunk/admin/photos_add_direct.php

    r5740 r5741  
    356356  '<link rel="stylesheet" type="text/css" href="'.$uploadify_path.'/uploadify.css">'."\n"
    357357  );
    358 
    359 // $page['thumbnails'] = array(
    360 //   array(
    361 //     'src' => 'http://localhost/piwigo/dev/trunk/upload/2006/08/16/thumbnail/TN-20060816234638-f9bebf5a.jpg',
    362 //     ),
    363 //   array(
    364 //     'src' => 'http://localhost/piwigo/dev/trunk/upload/2005/10/04/thumbnail/TN-20051004000000-864a003c.jpg',
    365 //     ),
    366 //   );
    367 // $page['batch_link'] = PHOTOS_ADD_BASE_URL.'&batch=1460,3307';
    368 
     358 
    369359if (isset($page['thumbnails']))
    370360{

  • trunk/admin/themes/default/template/photos_add_direct.tpl

    r5740 r5741  
    149149  <p id="batchLink"><a href="{$batch_link}">{$batch_label}</a></p>
    150150</fieldset>
    151 <p><a href="">Add another set of photos</a></p>
    152 {else}
     151{/if}
    153152
    154153<div id="formErrors" class="errors" style="display:none">
    … …  
    242241{/if}
    243242</form>
    244 {/if} {* empty($thumbnails) *}
    245 {/if} {* $setup_errors *}
     243{/if}
    246244
    247245</div> <!-- photosAddContent -->
Note: See TracChangeset for help on using the changeset viewer.