diff options
| author | Michael Gapczynski <GapczynskiM@gmail.com> | 2011-08-10 13:40:47 -0400 |
|---|---|---|
| committer | Michael Gapczynski <GapczynskiM@gmail.com> | 2011-08-10 13:40:47 -0400 |
| commit | e1bde1a78eac82f981358e68af031d974ca81639 (patch) | |
| tree | c9ccba7ab7aab6a5461a720d875c818bafad2b4a /files/templates | |
| parent | 80660bdc071632f699ea2051d56f03cc887948e6 (diff) | |
| parent | fbf86c6683da91c8cadad128e5ac7c0742aaffed (diff) | |
| download | nextcloud-server-e1bde1a78eac82f981358e68af031d974ca81639.tar.gz nextcloud-server-e1bde1a78eac82f981358e68af031d974ca81639.zip | |
Merge branch 'master' into sharing
Conflicts:
files/templates/index.php
Diffstat (limited to 'files/templates')
| -rw-r--r-- | files/templates/index.php | 18 | ||||
| -rw-r--r-- | files/templates/part.list.php | 2 |
2 files changed, 7 insertions, 13 deletions
diff --git a/files/templates/index.php b/files/templates/index.php index 1d059d88501..137c5ce5922 100644 --- a/files/templates/index.php +++ b/files/templates/index.php @@ -1,20 +1,18 @@ <div id="controls"> - <span class="nav"> - <?php echo($_['breadcrumb']); ?> - </span> + <?php echo($_['breadcrumb']); ?> <div class="actions"> <form data-upload-id='1' class="file_upload_form" action="ajax/upload.php" method="post" enctype="multipart/form-data" target="file_upload_target_1"> <input type="hidden" name="MAX_FILE_SIZE" value="<?php echo $_['uploadMaxFilesize'] ?>" id="max_upload"> <input type="hidden" class="max_human_file_size" value="(max <?php echo $_['uploadMaxHumanFilesize']; ?>)"> <input type="hidden" name="dir" value="<?php echo $_['dir'] ?>" id="dir"> <div class="file_upload_wrapper"> - <input type="submit" class="file_upload_filename" value="Upload (max. <?php echo $_['uploadMaxHumanFilesize'];?>)"/> + <input type="submit" class="file_upload_filename" value="<?php echo $l->t('Upload');?> (max. <?php echo $_['uploadMaxHumanFilesize'];?>)"/> <input class="file_upload_start" type="file" name='files[]'/> </div> <iframe name="file_upload_target_1" class='file_upload_target' src=""></iframe> </form> <form id="file_newfolder_form"> - <input type="text" name="file_newfolder_name" id="file_newfolder_name" value="" placeholder="New Folder" /> + <input type="text" name="file_newfolder_name" id="file_newfolder_name" value="" placeholder="<?php echo $l->t('New Folder')?>" /> </form> </div> <div id="file_action_panel"> @@ -29,12 +27,12 @@ <input type="checkbox" id="select_all" /> <span class='name'><?php echo $l->t( 'Name' ); ?></span> <span class='selectedActions'> - <a href="" title="Download" class="download"><img class='svg' alt="Download" src="../core/img/actions/download.svg" /></a> + <a href="" title="<?php echo $l->t('Download')?>" class="download"><img class='svg' alt="Download" src="../core/img/actions/download.svg" /></a> <a href="" title="Share" class="share"><img class='svg' alt="Share" src="../core/img/actions/share.svg" /></a> </span> </th> <th id='headerSize'><?php echo $l->t( 'Size MB' ); ?></th> - <th id='headerDate'><span id="modified"><?php echo $l->t( 'Modified' ); ?></span><span class='selectedActions'><a href="" title="Delete" class="delete"><img class='svg' alt="Delete" src="../core/img/actions/delete.svg" /></a></span></th> + <th id='headerDate'><span id="modified"><?php echo $l->t( 'Modified' ); ?></span><span class='selectedActions'><a href="" title="Delete" class="delete"><img class='svg' alt="<?php echo $l->t('Delete')?>" src="../core/img/actions/delete.svg" /></a></span></th> </tr> </thead> <tbody id="fileList"> @@ -42,14 +40,10 @@ </tbody> </table> -<div id="uploadsize-message" title="Upload too large"> +<div id="uploadsize-message" title="<?php echo $l->t('Upload too large')?>"> <p> <?php echo $l->t( 'The files you are trying to upload exceed the maximum size for file uploads on this server.' ); ?> </p> </div> -<div id="delete-confirm" title=""> - <p><span class="ui-icon ui-icon-alert" style="float:left; margin:0 7px 20px 0;"></span>These items will be permanently deleted and cannot be recovered. Are you sure?</p> -</div> - <span id="file_menu"/> diff --git a/files/templates/part.list.php b/files/templates/part.list.php index 5051c19949a..8b3823f391b 100644 --- a/files/templates/part.list.php +++ b/files/templates/part.list.php @@ -1,4 +1,4 @@ - <span id="emptyfolder" <?php if(count($_['files'])) echo 'style="display:none;"';?>>Nothing in here. Upload something!</span> + <span id="emptyfolder" <?php if(count($_['files'])) echo 'style="display:none;"';?>><?php echo $l->t('Nothing in here. Upload something!')?></span> <?php foreach($_['files'] as $file): $simple_file_size = simple_file_size($file['size']); $simple_size_color = intval(200-$file['size']/(1024*1024)*2); // the bigger the file, the darker the shade of grey; megabytes*2 |