diff options
| author | Bart Visscher <bartv@thisnet.nl> | 2013-07-04 18:23:47 +0200 |
|---|---|---|
| committer | Bart Visscher <bartv@thisnet.nl> | 2013-07-04 18:23:47 +0200 |
| commit | ad9458e85d319c12575293e0b25069d35db15720 (patch) | |
| tree | 83801af641b47e346bef0d72821b26e5d4cfb0fa /apps/files_sharing | |
| parent | 32d69f68896c08e216bc0e84db409d00ec654856 (diff) | |
| parent | f67fc78531a0180d3c60edb849b29ac744bacbaa (diff) | |
| download | nextcloud-server-ad9458e85d319c12575293e0b25069d35db15720.tar.gz nextcloud-server-ad9458e85d319c12575293e0b25069d35db15720.zip | |
Merge branch 'master' into convert-oc_config
Conflicts:
lib/config.php
Diffstat (limited to 'apps/files_sharing')
| -rw-r--r-- | apps/files_sharing/l10n/it.php | 2 | ||||
| -rw-r--r-- | apps/files_sharing/public.php | 2 | ||||
| -rw-r--r-- | apps/files_sharing/templates/authenticate.php | 3 | ||||
| -rw-r--r-- | apps/files_sharing/templates/public.php | 6 |
4 files changed, 9 insertions, 4 deletions
diff --git a/apps/files_sharing/l10n/it.php b/apps/files_sharing/l10n/it.php index 76a65dc130c..66d6af7fd14 100644 --- a/apps/files_sharing/l10n/it.php +++ b/apps/files_sharing/l10n/it.php @@ -5,6 +5,6 @@ "%s shared the file %s with you" => "%s ha condiviso il file %s con te", "Download" => "Scarica", "Upload" => "Carica", -"Cancel upload" => "Annulla invio", +"Cancel upload" => "Annulla il caricamento", "No preview available for" => "Nessuna anteprima disponibile per" ); diff --git a/apps/files_sharing/public.php b/apps/files_sharing/public.php index ef86013b3e7..fb18bc26248 100644 --- a/apps/files_sharing/public.php +++ b/apps/files_sharing/public.php @@ -79,7 +79,7 @@ if (isset($path)) { $linkItem['share_with']))) { $tmpl = new OCP\Template('files_sharing', 'authenticate', 'guest'); $tmpl->assign('URL', $url); - $tmpl->assign('error', true); + $tmpl->assign('wrongpw', true); $tmpl->printPage(); exit(); } else { diff --git a/apps/files_sharing/templates/authenticate.php b/apps/files_sharing/templates/authenticate.php index 7a67b6e5503..fa03f419130 100644 --- a/apps/files_sharing/templates/authenticate.php +++ b/apps/files_sharing/templates/authenticate.php @@ -1,5 +1,8 @@ <form action="<?php p($_['URL']); ?>" method="post"> <fieldset> + <?php if ($_['wrongpw']): ?> + <div class="warning"><?php p($l->t('The password is wrong. Try again.')); ?></div> + <?php endif; ?> <p class="infield"> <label for="password" class="infield"><?php p($l->t('Password')); ?></label> <input type="password" name="password" id="password" placeholder="" value="" autofocus /> diff --git a/apps/files_sharing/templates/public.php b/apps/files_sharing/templates/public.php index cbd5ddf7a7d..56ed4ca168e 100644 --- a/apps/files_sharing/templates/public.php +++ b/apps/files_sharing/templates/public.php @@ -2,6 +2,8 @@ <div id="notification" style="display: none;"></div> </div> +<?php $defaults = new OCP\Defaults(); // initialize themable default strings and urls ?> + <input type="hidden" name="dir" value="<?php p($_['dir']) ?>" id="dir"> <input type="hidden" name="downloadURL" value="<?php p($_['downloadURL']) ?>" id="downloadURL"> <input type="hidden" name="filename" value="<?php p($_['filename']) ?>" id="filename"> @@ -9,7 +11,7 @@ <header><div id="header"> <a href="<?php print_unescaped(link_to('', 'index.php')); ?>" title="" id="owncloud"><img class="svg" src="<?php print_unescaped(image_path('', 'logo-wide.svg')); ?>" alt="ownCloud" /></a> - <div id="logo-claim" style="display:none;"><?php p(OC_Defaults::getLogoClaim()); ?></div> + <div id="logo-claim" style="display:none;"><?php p($defaults->getLogoClaim()); ?></div> <div class="header-right"> <?php if (isset($_['folder'])): ?> <span id="details"><?php p($l->t('%s shared the folder %s with you', @@ -89,6 +91,6 @@ </div> <footer> <p class="info"> - <?php print_unescaped(OC_Defaults::getLongFooter()); ?> + <?php print_unescaped($defaults->getLongFooter()); ?> </p> </footer> |