diff options
Diffstat (limited to 'settings')
| -rw-r--r-- | settings/css/settings.css | 33 | ||||
| -rw-r--r-- | settings/js/apps.js | 26 | ||||
| -rw-r--r-- | settings/js/users.js | 2 | ||||
| -rw-r--r-- | settings/l10n/el.php | 6 | ||||
| -rw-r--r-- | settings/l10n/et_EE.php | 33 | ||||
| -rw-r--r-- | settings/l10n/pl_PL.php | 6 | ||||
| -rw-r--r-- | settings/l10n/sk_SK.php | 8 | ||||
| -rw-r--r-- | settings/l10n/tr.php | 6 | ||||
| -rw-r--r-- | settings/templates/admin.php | 61 | ||||
| -rw-r--r-- | settings/templates/apps.php | 49 | ||||
| -rw-r--r-- | settings/templates/personal.php | 175 |
11 files changed, 207 insertions, 198 deletions
diff --git a/settings/css/settings.css b/settings/css/settings.css index 2cb18670875..a7680aad948 100644 --- a/settings/css/settings.css +++ b/settings/css/settings.css @@ -12,11 +12,6 @@ input#openid, input#webdav { width:20em; } display: block; } -.personalblock input[type="checkbox"] { - position: relative; - top: 2px; -} - /* Sync clients */ .clientsbox { margin:12px; } .clientsbox h1 { font-size:40px; font-weight:bold; margin:50px 0 20px; } @@ -62,13 +57,7 @@ tr:hover>td.password>span, tr:hover>td.displayName>span { margin:0; cursor:point tr:hover>td.remove>a, tr:hover>td.password>img,tr:hover>td.displayName>img, tr:hover>td.quota>img { visibility:visible; cursor:pointer; } tr:hover>td.remove>a { float:right; } -li.selected, -#leftcontent li.selected { - background-color: #ddd; -} - table.grid { width:100%; } -#rightcontent { padding-left: 10px; } div.quota { float: right; display: block; @@ -105,31 +94,21 @@ select.quota.active { background: #fff; } /* APPS */ .appinfo { margin: 1em 40px; } -h3 { font-size: 1.4em; font-weight: bold; } -ul.applist a { - height: 2.2em; - padding: 0.2em 0.2em 0.2em 0.8em !important; -} -ul.applist .app-external { - width: 100%; +#app-navigation { + padding-bottom: 0px; } -li { color:#888; } -li.active { color:#000; } -#leftcontent .appwarning { +#app-navigation .appwarning { background: #fcc; } -#leftcontent .appwarning:hover { +#app-navigation.appwarning:hover { background: #fbb; } small.externalapp { color:#FFF; background-color:#BBB; font-weight:bold; font-size: 0.6em; margin: 0; padding: 0.1em 0.2em; border-radius: 4px;} -small.externalapp.list { float: right; } small.recommendedapp { color:#FFF; background-color:#888; font-weight:bold; font-size: 0.6em; margin: 0; padding: 0.1em 0.2em; border-radius: 4px;} -small.recommendedapp.list { float: right; } +small.externalapp.list, small.recommendedapp.list { position: absolute; right: 10px; top: 12px; } span.version { margin-left:1em; margin-right:1em; color:#555; } -.app { position: relative; display: inline-block; padding: 0.2em 0 0.2em 0 !important; text-overflow: hidden; overflow: hidden; white-space: nowrap; /*transition: .2s max-width linear; -o-transition: .2s max-width linear; -moz-transition: .2s max-width linear; -webkit-transition: .2s max-width linear; -ms-transition: .2s max-width linear;*/ } -.app.externalapp { max-width: 12.5em; } -.app.recommendedapp { max-width: 12.5em; } + /* Transition to complete width! */ .app:hover, .app:active { max-width: inherit; } diff --git a/settings/js/apps.js b/settings/js/apps.js index 3dbc8a2f7c2..05db4c9a048 100644 --- a/settings/js/apps.js +++ b/settings/js/apps.js @@ -8,7 +8,7 @@ OC.Settings = OC.Settings || {}; OC.Settings.Apps = OC.Settings.Apps || { loadApp:function(app) { - var page = $('#rightcontent'); + var page = $('#app-content'); page.find('p.license').show(); page.find('span.name').text(app.name); page.find('small.externalapp').text(app.internallabel); @@ -82,16 +82,16 @@ OC.Settings.Apps = OC.Settings.Apps || { page.find('p.appslink').hide(); page.find('span.score').hide(); } - if (typeof($('#leftcontent li[data-id="'+app.id+'"]').data('errormsg')) !== "undefined") { + if (typeof($('#app-navigation ul li[data-id="'+app.id+'"]').data('errormsg')) !== "undefined") { page.find(".warning").show(); - page.find(".warning").text($('#leftcontent li[data-id="'+app.id+'"]').data('errormsg')); + page.find(".warning").text($('#app-navigation ul li[data-id="'+app.id+'"]').data('errormsg')); } else { page.find(".warning").hide(); } }, enableApp:function(appid, active, element) { console.log('enableApp:', appid, active, element); - var appitem=$('#leftcontent li[data-id="'+appid+'"]'); + var appitem=$('#app-navigation ul li[data-id="'+appid+'"]'); element.val(t('settings','Please wait....')); if(active) { $.post(OC.filePath('settings','ajax','disableapp.php'),{appid:appid},function(result) { @@ -160,7 +160,7 @@ OC.Settings.Apps = OC.Settings.Apps || { }, insertApp:function(appdata) { - var applist = $('#leftcontent li'); + var applist = $('#app-navigation ul li'); var app = $('<li data-id="' + appdata.id + '" data-type="external" data-installed="0">' + '<a class="app externalapp" href="' + OC.filePath('settings', 'apps', 'index.php') + '&appid=' + appdata.id+'">' @@ -242,30 +242,30 @@ OC.Settings.Apps = OC.Settings.Apps || { }; $(document).ready(function(){ - $('#leftcontent li').each(function(index,li){ + $('#app-navigation ul li').each(function(index,li){ var app = OC.get('appData_'+$(li).data('id')); $(li).data('app',app); $(this).find('span.hidden').remove(); }); - $('#leftcontent li').keydown(function(event) { + $('#app-navigation ul li').keydown(function(event) { if (event.which === 13 || event.which === 32) { $(event.target).click(); } return false; }); - $(document).on('click', '#leftcontent', function(event){ + $(document).on('click', '#app-navigation', function(event){ var tgt = $(event.target); if (tgt.is('li') || tgt.is('a')) { var item = tgt.is('li') ? $(tgt) : $(tgt).parent(); var app = item.data('app'); OC.Settings.Apps.loadApp(app); - $('#leftcontent .selected').removeClass('selected'); + $('#app-navigation .selected').removeClass('selected'); item.addClass('selected'); } return false; }); - $('#rightcontent input.enable').click(function(){ + $('#app-content input.enable').click(function(){ var element = $(this); var appid=$(this).data('appid'); var active=$(this).data('active'); @@ -273,7 +273,7 @@ $(document).ready(function(){ OC.Settings.Apps.enableApp(appid, active, element); } }); - $('#rightcontent input.update').click(function(){ + $('#app-content input.update').click(function(){ var element = $(this); var appid=$(this).data('appid'); if(appid) { @@ -282,11 +282,11 @@ $(document).ready(function(){ }); if(appid) { - var item = $('#leftcontent li[data-id="'+appid+'"]'); + var item = $('#app-navigation ul li[data-id="'+appid+'"]'); if(item) { item.trigger('click'); item.addClass('active'); - $('#leftcontent').animate({scrollTop: $(item).offset().top-70}, 'slow','swing'); + $('#app-navigation').animate({scrollTop: $(item).offset().top-70}, 'slow','swing'); } } }); diff --git a/settings/js/users.js b/settings/js/users.js index 284976d3bad..eef3c237277 100644 --- a/settings/js/users.js +++ b/settings/js/users.js @@ -226,7 +226,7 @@ var UserList = { $('table+.loading').css('visibility', 'visible'); UserList.updating = true; var query = $.param({ offset: UserList.offset, limit: UserList.usersToLoad }); - $.get(OC.generateUrl('/settings/ajax/userlist') + query, function (result) { + $.get(OC.generateUrl('/settings/ajax/userlist') + '?' + query, function (result) { var loadedUsers = 0; var trs = []; if (result.status === 'success') { diff --git a/settings/l10n/el.php b/settings/l10n/el.php index c438fa0f997..0b6ee6a2983 100644 --- a/settings/l10n/el.php +++ b/settings/l10n/el.php @@ -1,5 +1,6 @@ <?php $TRANSLATIONS = array( +"Invalid value supplied for %s" => "Άκυρη τιμή για το %s", "Saved" => "Αποθηκεύτηκαν", "test email settings" => "δοκιμή ρυθμίσεων email", "If you received this email, the settings seem to be correct." => "Εάν λάβατε αυτό το email, οι ρυθμίσεις δείχνουν να είναι σωστές.", @@ -48,6 +49,7 @@ $TRANSLATIONS = array( "Select a profile picture" => "Επιλογή εικόνας προφίλ", "Very weak password" => "Πολύ αδύναμο συνθηματικό", "Weak password" => "Αδύναμο συνθηματικό", +"So-so password" => "Μέτριο συνθηματικό", "Good password" => "Καλό συνθηματικό", "Strong password" => "Δυνατό συνθηματικό", "Decrypting files... Please wait, this can take some time." => "Αποκρυπτογράφηση αρχείων... Παρακαλώ περιμένετε, αυτό μπορεί να πάρει κάποιο χρόνο.", @@ -70,6 +72,7 @@ $TRANSLATIONS = array( "Fatal issues only" => "Καίρια ζητήματα μόνο", "None" => "Τίποτα", "Login" => "Σύνδεση", +"Plain" => "Απλό", "NT LAN Manager" => "Διαχειριστης NT LAN", "SSL" => "SSL", "TLS" => "TLS", @@ -90,6 +93,9 @@ $TRANSLATIONS = array( "Internet connection not working" => "Η σύνδεση στο διαδίκτυο δεν δουλεύει", "This server has no working internet connection. This means that some of the features like mounting of external storage, notifications about updates or installation of 3rd party apps don´t work. Accessing files from remote and sending of notification emails might also not work. We suggest to enable internet connection for this server if you want to have all features." => "Αυτός ο διακομιστής δεν έχει ενεργή σύνδεση στο διαδίκτυο. Αυτό σημαίνει ότι κάποιες υπηρεσίες όπως η σύνδεση με εξωτερικούς αποθηκευτικούς χώρους, ειδοποιήσεις περί ενημερώσεων ή η εγκατάσταση 3ων εφαρμογών δεν θα είναι διαθέσιμες. Η πρόσβαση απομακρυσμένων αρχείων και η αποστολή ειδοποιήσεων μέσω ηλεκτρονικού ταχυδρομείου μπορεί επίσης να μην είναι διαθέσιμες. Προτείνουμε να ενεργοποιήσετε την πρόσβαση στο διαδίκτυο για αυτόν το διακομιστή εάν θέλετε να χρησιμοποιήσετε όλες τις υπηρεσίες.", "Cron" => "Cron", +"Last cron was executed at %s." => "Η τελευταία εκτέλεση του cron ήταν στις %s", +"Last cron was executed at %s. This is more than an hour ago, something seems wrong." => "Η τελευταία εκτέλεση του cron ήταν στις %s. Αυτό είναι πάνω από μια ώρα πριν, ίσως κάτι δεν πάει καλά.", +"Cron was not executed yet!" => "Η διεργασία cron δεν εκτελέστηκε ακόμα!", "Execute one task with each page loaded" => "Εκτέλεση μιας διεργασίας με κάθε σελίδα που φορτώνεται", "cron.php is registered at a webcron service to call cron.php every 15 minutes over http." => "Το cron.php είναι καταχωρημένο σε μια υπηρεσία webcron ώστε να καλεί το cron.php κάθε 15 λεπτά μέσω http.", "Use systems cron service to call the cron.php file every 15 minutes." => "Χρήση της υπηρεσίας cron του συστήματος για να καλεστεί το αρχείο cron.php κάθε 15 λεπτά.", diff --git a/settings/l10n/et_EE.php b/settings/l10n/et_EE.php index c294fcc137c..677ae3d6bb6 100644 --- a/settings/l10n/et_EE.php +++ b/settings/l10n/et_EE.php @@ -1,7 +1,15 @@ <?php $TRANSLATIONS = array( +"Invalid value supplied for %s" => "Sisestatud sobimatu väärtus %s jaoks", +"Saved" => "Salvestatud", +"test email settings" => "testi e-posti seadeid", +"If you received this email, the settings seem to be correct." => "Kui said selle kirja, siis on seadistus korrektne.", +"A problem occurred while sending the e-mail. Please revisit your settings." => "Kirja saatmisel tekkis tõrge. Palun kontrolli üle oma seadistus.", "Email sent" => "E-kiri on saadetud", +"You need to set your user email before being able to send test emails." => "Pead seadistama oma e-postienne kui on võimalik saata test-kirju.", +"Send mode" => "Saatmise viis", "Encryption" => "Krüpteerimine", +"Authentication method" => "Autentimise meetod", "Unable to load list from App Store" => "App Store'i nimekirja laadimine ebaõnnestus", "Authentication error" => "Autentimise viga", "Your full name has been changed." => "Sinu täispikk nimi on muudetud.", @@ -24,7 +32,9 @@ $TRANSLATIONS = array( "Wrong admin recovery password. Please check the password and try again." => "Vale administraatori taasteparool. Palun kontrolli parooli ning proovi uuesti.", "Back-end doesn't support password change, but the users encryption key was successfully updated." => "Tagarakend ei toeta parooli vahetust, kuid kasutaja krüptimisvõti uuendati edukalt.", "Unable to change password" => "Ei suuda parooli muuta", +"Sending..." => "Saadan...", "User Documentation" => "Kasutaja dokumentatsioon", +"Admin Documentation" => "Admin dokumentatsioon", "Update to {appversion}" => "Uuenda versioonile {appversion}", "Disable" => "Lülita välja", "Enable" => "Lülita sisse", @@ -37,6 +47,11 @@ $TRANSLATIONS = array( "Update" => "Uuenda", "Updated" => "Uuendatud", "Select a profile picture" => "Vali profiili pilt", +"Very weak password" => "Väga nõrk parool", +"Weak password" => "Nõrk parool", +"So-so password" => "Enam-vähem sobiv parool", +"Good password" => "Hea parool", +"Strong password" => "Väga hea parool", "Decrypting files... Please wait, this can take some time." => "Dekrüpteerin faile... Palun oota, see võib võtta veidi aega.", "deleted" => "kustutatud", "undo" => "tagasi", @@ -57,6 +72,10 @@ $TRANSLATIONS = array( "Fatal issues only" => "Ainult tõsised probleemid", "None" => "Pole", "Login" => "Logi sisse", +"Plain" => "Tavatekst", +"NT LAN Manager" => "NT LAN Manager", +"SSL" => "SSL", +"TLS" => "TLS", "Security Warning" => "Turvahoiatus", "You are accessing %s via HTTP. We strongly suggest you configure your server to require using HTTPS instead." => "Sa kasutad %s ligipääsuks HTTP protokolli. Soovitame tungivalt seadistada oma server selle asemel kasutama HTTPS-i.", "Your data directory and your files are probably accessible from the internet. The .htaccess file is not working. We strongly suggest that you configure your webserver in a way that the data directory is no longer accessible or you move the data directory outside the webserver document root." => "Andmete kataloog ja failid on tõenäoliselt internetis avalikult saadaval. .htaccess fail, ei toimi. Soovitame tungivalt veebiserver seadistada selliselt, et andmete kataloog ei oleks enam vabalt saadaval või tõstaksid andmete kataloogi oma veebiserveri veebi juurkataloogist mujale.", @@ -74,6 +93,9 @@ $TRANSLATIONS = array( "Internet connection not working" => "Internetiühendus ei toimi", "This server has no working internet connection. This means that some of the features like mounting of external storage, notifications about updates or installation of 3rd party apps don´t work. Accessing files from remote and sending of notification emails might also not work. We suggest to enable internet connection for this server if you want to have all features." => "Serveril puudub toimiv internetiühendus. See tähendab, et mõned funktsionaalsused, nagu näiteks väliste andmehoidlate ühendamine, teavitused uuendustest või kolmandate osapoolte rakenduste paigaldamine ei tööta. Eemalt failidele ligipääs ning teadete saatmine emailiga ei pruugi samuti toimida. Kui soovid täielikku funktsionaalsust, siis soovitame serverile tagada ligipääs internetti.", "Cron" => "Cron", +"Last cron was executed at %s." => "Cron käivitati viimati %s.", +"Last cron was executed at %s. This is more than an hour ago, something seems wrong." => "Cron käivitati viimati %s. See on rohkem kui tund tagasi, midagi on valesti.", +"Cron was not executed yet!" => "Cron pole kordagi käivitatud!", "Execute one task with each page loaded" => "Käivita toiming igal lehe laadimisel", "cron.php is registered at a webcron service to call cron.php every 15 minutes over http." => "cron.php on registreeritud webcron teenuses, et käivitada fail cron.php iga 15 minuti tagant üle http.", "Use systems cron service to call the cron.php file every 15 minutes." => "Kasuta süsteemi cron teenust, et käivitada fail cron.php iga 15 minuti tagant.", @@ -94,9 +116,17 @@ $TRANSLATIONS = array( "Enforce HTTPS" => "Sunni peale HTTPS-i kasutamine", "Forces the clients to connect to %s via an encrypted connection." => "Sunnib kliente %s ühenduma krüpteeritult.", "Please connect to your %s via HTTPS to enable or disable the SSL enforcement." => "Palun ühendu oma %s üle HTTPS või keela SSL kasutamine.", +"Email Server" => "Postiserver", +"This is used for sending out notifications." => "Seda kasutatakse teadete välja saatmiseks.", +"From address" => "Saatja aadress", +"Authentication required" => "Autentimine on vajalik", "Server address" => "Serveri aadress", "Port" => "Port", "Credentials" => "Kasutajatunnused", +"SMTP Username" => "SMTP kasutajatunnus", +"SMTP Password" => "SMTP parool", +"Test email settings" => "Testi e-posti seadeid", +"Send email" => "Saada kiri", "Log" => "Logi", "Log level" => "Logi tase", "More" => "Rohkem", @@ -106,7 +136,9 @@ $TRANSLATIONS = array( "Add your App" => "Lisa oma rakendus", "More Apps" => "Veel rakendusi", "Select an App" => "Vali programm", +"Documentation:" => "Dokumentatsioon:", "See application page at apps.owncloud.com" => "Vaata rakenduste lehte aadressil apps.owncloud.com", +"See application website" => "Vaata rakendi veebilehte", "<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>" => "<span class=\"licence\"></span>-litsenseeritud <span class=\"author\"></span>", "Administrator Documentation" => "Administraatori dokumentatsioon", "Online Documentation" => "Online dokumentatsioon", @@ -125,6 +157,7 @@ $TRANSLATIONS = array( "Full Name" => "Täispikk nimi", "Email" => "E-post", "Your email address" => "Sinu e-posti aadress", +"Fill in an email address to enable password recovery and receive notifications" => "Täida e-posti aadress võimaldamaks parooli taastamist ning teadete saamist.", "Profile picture" => "Profiili pilt", "Upload new" => "Laadi uus üles", "Select new from Files" => "Vali failidest uus", diff --git a/settings/l10n/pl_PL.php b/settings/l10n/pl_PL.php deleted file mode 100644 index 91ae517f236..00000000000 --- a/settings/l10n/pl_PL.php +++ /dev/null @@ -1,6 +0,0 @@ -<?php -$TRANSLATIONS = array( -"Update" => "Uaktualnienie", -"Email" => "Email" -); -$PLURAL_FORMS = "nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);"; diff --git a/settings/l10n/sk_SK.php b/settings/l10n/sk_SK.php index eaa8552f9cf..e613b5b04c7 100644 --- a/settings/l10n/sk_SK.php +++ b/settings/l10n/sk_SK.php @@ -1,5 +1,6 @@ <?php $TRANSLATIONS = array( +"Saved" => "Uložené", "Email sent" => "Email odoslaný", "Encryption" => "Šifrovanie", "Unable to load list from App Store" => "Nie je možné nahrať zoznam z App Store", @@ -24,6 +25,7 @@ $TRANSLATIONS = array( "Wrong admin recovery password. Please check the password and try again." => "Chybné administrátorské heslo pre obnovu. Skontrolujte správnosť hesla a skúste to znovu.", "Back-end doesn't support password change, but the users encryption key was successfully updated." => "Úložisko nepodporuje zmenu hesla, ale šifrovací kľúč používateľov bol úspešne zmenený.", "Unable to change password" => "Zmena hesla sa nepodarila", +"Sending..." => "Odosielam...", "User Documentation" => "Príručka používateľa", "Update to {appversion}" => "Aktualizovať na {appversion}", "Disable" => "Zakázať", @@ -57,6 +59,8 @@ $TRANSLATIONS = array( "Fatal issues only" => "Len fatálne problémy", "None" => "Žiadny", "Login" => "Prihlásenie", +"SSL" => "SSL", +"TLS" => "TLS", "Security Warning" => "Bezpečnostné upozornenie", "You are accessing %s via HTTP. We strongly suggest you configure your server to require using HTTPS instead." => "Do %s máte prístup cez HTTP. Dôrazne odporúčame nakonfigurovať server tak, aby namiesto toho vyžadoval použitie HTTPS.", "Your data directory and your files are probably accessible from the internet. The .htaccess file is not working. We strongly suggest that you configure your webserver in a way that the data directory is no longer accessible or you move the data directory outside the webserver document root." => "Váš priečinok s dátami aj vaše súbory sú pravdepodobne prístupné z internetu. Súbor .htaccess nefunguje. Odporúčame nakonfigurovať webový server tak, aby priečinok s dátami nebol naďalej prístupný, alebo presunúť priečinok s dátami mimo priestor sprístupňovaný webovým serverom.", @@ -94,9 +98,13 @@ $TRANSLATIONS = array( "Enforce HTTPS" => "Vynútiť HTTPS", "Forces the clients to connect to %s via an encrypted connection." => "Vynúti pripájanie klientov k %s šifrovaným pripojením.", "Please connect to your %s via HTTPS to enable or disable the SSL enforcement." => "Pripojte sa k %s cez HTTPS pre povolenie alebo zakázanie vynútenia SSL.", +"Email Server" => "Email server", "Server address" => "Adresa servera", "Port" => "Port", "Credentials" => "Prihlasovanie údaje", +"SMTP Username" => "SMTP používateľské meno", +"SMTP Password" => "SMTP heslo", +"Send email" => "Odoslať email", "Log" => "Záznam", "Log level" => "Úroveň záznamu", "More" => "Viac", diff --git a/settings/l10n/tr.php b/settings/l10n/tr.php index 68b464a5cc2..728e573be2f 100644 --- a/settings/l10n/tr.php +++ b/settings/l10n/tr.php @@ -78,9 +78,9 @@ $TRANSLATIONS = array( "TLS" => "TLS", "Security Warning" => "Güvenlik Uyarısı", "You are accessing %s via HTTP. We strongly suggest you configure your server to require using HTTPS instead." => "%s konumuna HTTP aracılığıyla erişiyorsunuz. Sunucunuzu HTTPS kullanımını zorlaması üzere yapılandırmanızı şiddetle öneririz.", -"Your data directory and your files are probably accessible from the internet. The .htaccess file is not working. We strongly suggest that you configure your webserver in a way that the data directory is no longer accessible or you move the data directory outside the webserver document root." => "data dizininiz ve dosyalarınız büyük ihtimalle internet üzerinden erişilebilir. .htaccess dosyası çalışmıyor. Web sunucunuzu yapılandırarak data dizinine erişimi kapatmanızı veya data dizinini web sunucu döküman dizini dışına almanızı şiddetle tavsiye ederiz.", +"Your data directory and your files are probably accessible from the internet. The .htaccess file is not working. We strongly suggest that you configure your webserver in a way that the data directory is no longer accessible or you move the data directory outside the webserver document root." => "data dizininiz ve dosyalarınız büyük ihtimalle internet üzerinden erişilebilir. .htaccess dosyası çalışmıyor. Web sunucunuzu yapılandırarak data dizinine erişimi kapatmanızı veya data dizinini web sunucu belge kök dizini dışına almanızı şiddetle tavsiye ederiz.", "Setup Warning" => "Kurulum Uyarısı", -"Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." => "Web sunucunuz dosya transferi için düzgün bir şekilde yapılandırılmamış. WevDAV arabirimini sorunlu gözüküyor.", +"Your web server is not yet properly setup to allow files synchronization because the WebDAV interface seems to be broken." => "Web sunucunuz dosya aktarımı için düzgün bir şekilde yapılandırılmamış. WevDAV arayüzü sorunlu görünüyor.", "Please double check the <a href=\"%s\">installation guides</a>." => "Lütfen <a href='%s'>kurulum kılavuzlarını</a> tekrar kontrol edin.", "Module 'fileinfo' missing" => "Modül 'fileinfo' kayıp", "The PHP module 'fileinfo' is missing. We strongly recommend to enable this module to get best results with mime-type detection." => "PHP modülü 'fileinfo' kayıp. MIME-tip tanıma ile en iyi sonuçları elde etmek için bu modülü etkinleştirmenizi öneririz.", @@ -115,7 +115,7 @@ $TRANSLATIONS = array( "Security" => "Güvenlik", "Enforce HTTPS" => "HTTPS bağlantısına zorla", "Forces the clients to connect to %s via an encrypted connection." => "İstemcileri %s'a şifreli bir bağlantı ile bağlanmaya zorlar.", -"Please connect to your %s via HTTPS to enable or disable the SSL enforcement." => "SSL zorlamasını etkinleştirmek ya da devre dışı bırakmak için lütfen ,%s'a HTTPS ile bağlanın.", +"Please connect to your %s via HTTPS to enable or disable the SSL enforcement." => "SSL zorlamasını etkinleştirmek ya da devre dışı bırakmak için lütfen %s'a HTTPS ile bağlanın.", "Email Server" => "E-Posta Sunucusu", "This is used for sending out notifications." => "Bu, bildirimler gönderilirken kullanılır.", "From address" => "Kimden adresi", diff --git a/settings/templates/admin.php b/settings/templates/admin.php index 9092d2833fd..10f19b8891e 100644 --- a/settings/templates/admin.php +++ b/settings/templates/admin.php @@ -43,35 +43,35 @@ if ($_['mail_smtpmode'] == 'qmail') { // is ssl working ? if (!$_['isConnectedViaHTTPS']) { ?> -<fieldset class="personalblock"> +<div class="section"> <h2><?php p($l->t('Security Warning'));?></h2> <span class="securitywarning"> <?php p($l->t('You are accessing %s via HTTP. We strongly suggest you configure your server to require using HTTPS instead.', $theme->getTitle())); ?> </span> -</fieldset> +</div> <?php } // is htaccess working ? if (!$_['htaccessworking']) { ?> -<fieldset class="personalblock"> +<div class="section"> <h2><?php p($l->t('Security Warning'));?></h2> <span class="securitywarning"> <?php p($l->t('Your data directory and your files are probably accessible from the internet. The .htaccess file is not working. We strongly suggest that you configure your webserver in a way that the data directory is no longer accessible or you move the data directory outside the webserver document root.')); ?> </span> -</fieldset> +</div> <?php } // is WebDAV working ? if (!$_['isWebDavWorking']) { ?> -<fieldset class="personalblock"> +<div class="section"> <h2><?php p($l->t('Setup Warning'));?></h2> <span class="securitywarning"> @@ -79,42 +79,42 @@ if (!$_['isWebDavWorking']) { <?php print_unescaped($l->t('Please double check the <a href="%s">installation guides</a>.', link_to_docs('admin-install'))); ?> </span> -</fieldset> +</div> <?php } // if module fileinfo available? if (!$_['has_fileinfo']) { ?> -<fieldset class="personalblock"> +<div class="section"> <h2><?php p($l->t('Module \'fileinfo\' missing'));?></h2> <span class="connectionwarning"> <?php p($l->t('The PHP module \'fileinfo\' is missing. We strongly recommend to enable this module to get best results with mime-type detection.')); ?> </span> -</fieldset> +</div> <?php } // is PHP at least at 5.3.8? if ($_['old_php']) { ?> -<fieldset class="personalblock"> +<div class="section"> <h2><?php p($l->t('Your PHP version is outdated'));?></h2> <span class="connectionwarning"> <?php p($l->t('Your PHP version is outdated. We strongly recommend to update to 5.3.8 or newer because older versions are known to be broken. It is possible that this installation is not working correctly.')); ?> </span> -</fieldset> +</div> <?php } // is locale working ? if (!$_['isLocaleWorking']) { ?> -<fieldset class="personalblock"> +<div class="section"> <h2><?php p($l->t('Locale not working'));?></h2> <span class="connectionwarning"> @@ -132,21 +132,21 @@ if (!$_['isLocaleWorking']) { ?> </span> -</fieldset> +</div> <?php } // is internet connection working ? if (!$_['internetconnectionworking']) { ?> -<fieldset class="personalblock"> +<div class="section"> <h2><?php p($l->t('Internet connection not working'));?></h2> <span class="connectionwarning"> <?php p($l->t('This server has no working internet connection. This means that some of the features like mounting of external storage, notifications about updates or installation of 3rd party apps don´t work. Accessing files from remote and sending of notification emails might also not work. We suggest to enable internet connection for this server if you want to have all features.')); ?> </span> -</fieldset> +</div> <?php } ?> @@ -156,7 +156,7 @@ if (!$_['internetconnectionworking']) { } ;?> -<fieldset class="personalblock" id="backgroundjobs"> +<div class="section" id="backgroundjobs"> <h2 class="inlineblock"><?php p($l->t('Cron'));?></h2> <?php if ($_['cron_log']): ?> <p class="cronlog inlineblock"> @@ -199,9 +199,9 @@ if (!$_['internetconnectionworking']) { <label for="backgroundjobs_cron">Cron</label><br/> <em><?php p($l->t("Use systems cron service to call the cron.php file every 15 minutes.")); ?></em> </p> -</fieldset> +</div> -<fieldset class="personalblock" id="shareAPI"> +<div class="section" id="shareAPI"> <h2><?php p($l->t('Sharing'));?></h2> <table class="shareAPI"> <tr> @@ -255,9 +255,9 @@ if (!$_['internetconnectionworking']) { </td> </tr> </table> -</fieldset> +</div> -<fieldset class="personalblock" id="security"> +<div class="section" id="security"> <h2><?php p($l->t('Security'));?></h2> <table> <tr> @@ -288,9 +288,9 @@ if (!$_['internetconnectionworking']) { </td> </tr> </table> -</fieldset> +</div> -<fieldset id="mail_settings" class="personalblock"> +<div id="mail_settings" class="section"> <h2><?php p($l->t('Email Server'));?> <span id="mail_settings_msg" class="msg"></span></h2> <p><?php p($l->t('This is used for sending out notifications.')); ?></p> @@ -370,9 +370,9 @@ if (!$_['internetconnectionworking']) { <em><?php p($l->t( 'Test email settings' )); ?></em> <input type="submit" name="sendtestemail" id="sendtestemail" value="<?php p($l->t( 'Send email' )); ?>"/> <span id="sendtestmail_msg" class="msg"></span> -</fieldset> +</div> -<fieldset class="personalblock"> +<div class="section"> <h2><?php p($l->t('Log'));?></h2> <?php p($l->t('Log level'));?> <select name='loglevel' id='loglevel'> <?php for ($i = 0; $i < 5; $i++): @@ -410,9 +410,9 @@ if (!$_['internetconnectionworking']) { <input id="lessLog" type="button" value="<?php p($l->t('Less'));?>..."> <?php endif; ?> -</fieldset> +</div> -<fieldset class="personalblock"> +<div class="section"> <h2><?php p($l->t('Version'));?></h2> <strong><?php p($theme->getTitle()); ?></strong> <?php p(OC_Util::getHumanVersion()) ?> <?php if (OC_Util::getEditionString() === ''): ?> @@ -420,9 +420,8 @@ if (!$_['internetconnectionworking']) { <?php print_unescaped($l->t('Developed by the <a href="http://ownCloud.org/contact" target="_blank">ownCloud community</a>, the <a href="https://github.com/owncloud" target="_blank">source code</a> is licensed under the <a href="http://www.gnu.org/licenses/agpl-3.0.html" target="_blank"><abbr title="Affero General Public License">AGPL</abbr></a>.')); ?> </p> <?php endif; ?> -</fieldset> -<fieldset class="personalblock credits-footer"> -<p> - <?php print_unescaped($theme->getShortFooter()); ?> -</p> -</fieldset> +</div> + +<div class="section credits-footer"> + <p><?php print_unescaped($theme->getShortFooter()); ?></p> +</div> diff --git a/settings/templates/apps.php b/settings/templates/apps.php index 4c77c62f511..b7f3b6121ad 100644 --- a/settings/templates/apps.php +++ b/settings/templates/apps.php @@ -7,32 +7,33 @@ src="<?php print_unescaped(OC_Helper::linkToRoute('apps_custom'));?>?appid=<?php p($_['appid']); ?>"></script> <script type="text/javascript" src="<?php print_unescaped(OC_Helper::linkTo('settings/js', 'apps.js'));?>"></script> +<div id="app-navigation"> + <ul class="applist"> + <?php if(OC_Config::getValue('appstoreenabled', true) === true): ?> + <li> + <a class="app-external" target="_blank" href="http://owncloud.org/dev"><?php p($l->t('Add your App'));?> …</a> + </li> + <?php endif; ?> -<ul id="leftcontent" class="applist"> - <?php if(OC_Config::getValue('appstoreenabled', true) === true): ?> - <li> - <a class="app-external" target="_blank" href="http://owncloud.org/dev"><?php p($l->t('Add your App'));?> …</a> - </li> - <?php endif; ?> + <?php foreach($_['apps'] as $app):?> + <li <?php if($app['active']) print_unescaped('class="active"')?> data-id="<?php p($app['id']) ?>" + <?php if ( isset( $app['ocs_id'] ) ) { print_unescaped("data-id-ocs=\"{".OC_Util::sanitizeHTML($app['ocs_id'])."}\""); } ?> + data-type="<?php p($app['internal'] ? 'internal' : 'external') ?>" data-installed="1"> + <a class="app<?php if(!$app['internal']) p(' externalapp') ?>" + href="?appid=<?php p($app['id']) ?>"><?php p($app['name']) ?></a> + <?php if(!$app['internal']) + print_unescaped('<small class="'.OC_Util::sanitizeHTML($app['internalclass']).' list">'.OC_Util::sanitizeHTML($app['internallabel']).'</small>') ?> + </li> + <?php endforeach;?> - <?php foreach($_['apps'] as $app):?> - <li <?php if($app['active']) print_unescaped('class="active"')?> data-id="<?php p($app['id']) ?>" - <?php if ( isset( $app['ocs_id'] ) ) { print_unescaped("data-id-ocs=\"{".OC_Util::sanitizeHTML($app['ocs_id'])."}\""); } ?> - data-type="<?php p($app['internal'] ? 'internal' : 'external') ?>" data-installed="1"> - <a class="app<?php if(!$app['internal']) p(' externalapp') ?>" - href="?appid=<?php p($app['id']) ?>"><?php p($app['name']) ?></a> - <?php if(!$app['internal']) - print_unescaped('<small class="'.OC_Util::sanitizeHTML($app['internalclass']).' list">'.OC_Util::sanitizeHTML($app['internallabel']).'</small>') ?> - </li> - <?php endforeach;?> - - <?php if(OC_Config::getValue('appstoreenabled', true) === true): ?> - <li> - <a class="app-external" target="_blank" href="http://apps.owncloud.com"><?php p($l->t('More Apps'));?> …</a> - </li> - <?php endif; ?> -</ul> -<div id="rightcontent"> + <?php if(OC_Config::getValue('appstoreenabled', true) === true): ?> + <li> + <a class="app-external" target="_blank" href="http://apps.owncloud.com"><?php p($l->t('More Apps'));?> …</a> + </li> + <?php endif; ?> + </ul> +</div> +<div id="app-content"> <div class="appinfo"> <h3><strong><span class="name"><?php p($l->t('Select an App'));?></span></strong><span class="version"></span><small class="externalapp" style="visibility:hidden;"></small></h3> diff --git a/settings/templates/personal.php b/settings/templates/personal.php index 9024f435657..cc1fce88c9f 100644 --- a/settings/templates/personal.php +++ b/settings/templates/personal.php @@ -21,7 +21,7 @@ </div> -<div id="quota" class="personalblock"> +<div id="quota" class="section"> <div style="width:<?php p($_['usage_relative']);?>%;"> <p id="quotatext"> <?php print_unescaped($l->t('You have used <strong>%s</strong> of the available <strong>%s</strong>', @@ -34,23 +34,21 @@ <?php if($_['passwordChangeSupported']) { ?> -<form id="passwordform"> - <fieldset class="personalblock"> - <h2><?php p($l->t('Password'));?></h2> - <div id="passwordchanged"><?php echo $l->t('Your password was changed');?></div> - <div id="passworderror"><?php echo $l->t('Unable to change your password');?></div> - <input type="password" id="pass1" name="oldpassword" - placeholder="<?php echo $l->t('Current password');?>" - autocomplete="off" autocapitalize="off" autocorrect="off" /> - <input type="password" id="pass2" name="personal-password" - placeholder="<?php echo $l->t('New password');?>" - data-typetoggle="#personal-show" - autocomplete="off" autocapitalize="off" autocorrect="off" /> - <input type="checkbox" id="personal-show" name="show" /><label for="personal-show"></label> - <input id="passwordbutton" type="submit" value="<?php echo $l->t('Change password');?>" /> - <br/> - <div class="strengthify-wrapper"></div> - </fieldset> +<form id="passwordform" class="section"> + <h2><?php p($l->t('Password'));?></h2> + <div id="passwordchanged"><?php echo $l->t('Your password was changed');?></div> + <div id="passworderror"><?php echo $l->t('Unable to change your password');?></div> + <input type="password" id="pass1" name="oldpassword" + placeholder="<?php echo $l->t('Current password');?>" + autocomplete="off" autocapitalize="off" autocorrect="off" /> + <input type="password" id="pass2" name="personal-password" + placeholder="<?php echo $l->t('New password');?>" + data-typetoggle="#personal-show" + autocomplete="off" autocapitalize="off" autocorrect="off" /> + <input type="checkbox" id="personal-show" name="show" /><label for="personal-show"></label> + <input id="passwordbutton" type="submit" value="<?php echo $l->t('Change password');?>" /> + <br/> + <div class="strengthify-wrapper"></div> </form> <?php } @@ -59,15 +57,13 @@ if($_['passwordChangeSupported']) { <?php if($_['displayNameChangeSupported']) { ?> -<form id="displaynameform"> - <fieldset class="personalblock"> - <h2><?php echo $l->t('Full Name');?></h2> - <input type="text" id="displayName" name="displayName" - value="<?php p($_['displayName'])?>" - autocomplete="on" autocapitalize="off" autocorrect="off" /> - <span class="msg"></span> - <input type="hidden" id="oldDisplayName" name="oldDisplayName" value="<?php p($_['displayName'])?>" /> - </fieldset> +<form id="displaynameform" class="section"> + <h2><?php echo $l->t('Full Name');?></h2> + <input type="text" id="displayName" name="displayName" + value="<?php p($_['displayName'])?>" + autocomplete="on" autocapitalize="off" autocorrect="off" /> + <span class="msg"></span> + <input type="hidden" id="oldDisplayName" name="oldDisplayName" value="<?php p($_['displayName'])?>" /> </form> <?php } @@ -76,85 +72,79 @@ if($_['displayNameChangeSupported']) { <?php if($_['passwordChangeSupported']) { ?> -<form id="lostpassword"> - <fieldset class="personalblock"> - <h2><?php p($l->t('Email'));?></h2> - <input type="text" name="email" id="email" value="<?php p($_['email']); ?>" - placeholder="<?php p($l->t('Your email address'));?>" - autocomplete="on" autocapitalize="off" autocorrect="off" /> - <span class="msg"></span><br /> - <em><?php p($l->t('Fill in an email address to enable password recovery and receive notifications'));?></em> - </fieldset> +<form id="lostpassword" class="section"> + <h2><?php p($l->t('Email'));?></h2> + <input type="text" name="email" id="email" value="<?php p($_['email']); ?>" + placeholder="<?php p($l->t('Your email address'));?>" + autocomplete="on" autocapitalize="off" autocorrect="off" /> + <span class="msg"></span><br /> + <em><?php p($l->t('Fill in an email address to enable password recovery and receive notifications'));?></em> </form> <?php } ?> <?php if ($_['enableAvatars']): ?> -<form id="avatar" method="post" action="<?php p(\OC_Helper::linkToRoute('core_avatar_post')); ?>"> - <fieldset class="personalblock"> - <h2><?php p($l->t('Profile picture')); ?></h2> - <div id="displayavatar"> - <div class="avatardiv"></div><br> - <div class="warning hidden"></div> - <?php if ($_['avatarChangeSupported']): ?> - <div class="inlineblock button" id="uploadavatarbutton"><?php p($l->t('Upload new')); ?></div> - <input type="file" class="hidden" name="files[]" id="uploadavatar"> - <div class="inlineblock button" id="selectavatar"><?php p($l->t('Select new from Files')); ?></div> - <div class="inlineblock button" id="removeavatar"><?php p($l->t('Remove image')); ?></div><br> - <?php p($l->t('Either png or jpg. Ideally square but you will be able to crop it.')); ?> - <?php else: ?> - <?php p($l->t('Your avatar is provided by your original account.')); ?> - <?php endif; ?> - </div> - <div id="cropper" class="hidden"> - <div class="inlineblock button" id="abortcropperbutton"><?php p($l->t('Cancel')); ?></div> - <div class="inlineblock button primary" id="sendcropperbutton"><?php p($l->t('Choose as profile image')); ?></div> - </div> - </fieldset> +<form id="avatar" class="section" method="post" action="<?php p(\OC_Helper::linkToRoute('core_avatar_post')); ?>"> + <h2><?php p($l->t('Profile picture')); ?></h2> + <div id="displayavatar"> + <div class="avatardiv"></div><br> + <div class="warning hidden"></div> + <?php if ($_['avatarChangeSupported']): ?> + <div class="inlineblock button" id="uploadavatarbutton"><?php p($l->t('Upload new')); ?></div> + <input type="file" class="hidden" name="files[]" id="uploadavatar"> + <div class="inlineblock button" id="selectavatar"><?php p($l->t('Select new from Files')); ?></div> + <div class="inlineblock button" id="removeavatar"><?php p($l->t('Remove image')); ?></div><br> + <?php p($l->t('Either png or jpg. Ideally square but you will be able to crop it.')); ?> + <?php else: ?> + <?php p($l->t('Your avatar is provided by your original account.')); ?> + <?php endif; ?> + </div> + <div id="cropper" class="hidden"> + <div class="inlineblock button" id="abortcropperbutton"><?php p($l->t('Cancel')); ?></div> + <div class="inlineblock button primary" id="sendcropperbutton"><?php p($l->t('Choose as profile image')); ?></div> + </div> </form> <?php endif; ?> -<form> - <fieldset class="personalblock"> - <h2><?php p($l->t('Language'));?></h2> - <select id="languageinput" name="lang" data-placeholder="<?php p($l->t('Language'));?>"> - <option value="<?php p($_['activelanguage']['code']);?>"> - <?php p($_['activelanguage']['name']);?> +<form class="section"> + <h2><?php p($l->t('Language'));?></h2> + <select id="languageinput" name="lang" data-placeholder="<?php p($l->t('Language'));?>"> + <option value="<?php p($_['activelanguage']['code']);?>"> + <?php p($_['activelanguage']['name']);?> + </option> + <?php foreach($_['commonlanguages'] as $language):?> + <option value="<?php p($language['code']);?>"> + <?php p($language['name']);?> </option> - <?php foreach($_['commonlanguages'] as $language):?> - <option value="<?php p($language['code']);?>"> - <?php p($language['name']);?> - </option> - <?php endforeach;?> - <optgroup label="––––––––––"></optgroup> - <?php foreach($_['languages'] as $language):?> - <option value="<?php p($language['code']);?>"> - <?php p($language['name']);?> - </option> - <?php endforeach;?> - </select> - <?php if (OC_Util::getEditionString() === ''): ?> - <a href="https://www.transifex.com/projects/p/owncloud/team/<?php p($_['activelanguage']['code']);?>/" - target="_blank"> - <em><?php p($l->t('Help translate'));?></em> - </a> - <?php endif; ?> - </fieldset> + <?php endforeach;?> + <optgroup label="––––––––––"></optgroup> + <?php foreach($_['languages'] as $language):?> + <option value="<?php p($language['code']);?>"> + <?php p($language['name']);?> + </option> + <?php endforeach;?> + </select> + <?php if (OC_Util::getEditionString() === ''): ?> + <a href="https://www.transifex.com/projects/p/owncloud/team/<?php p($_['activelanguage']['code']);?>/" + target="_blank"> + <em><?php p($l->t('Help translate'));?></em> + </a> + <?php endif; ?> </form> -<fieldset class="personalblock"> +<div class="section"> <h2><?php p($l->t('WebDAV'));?></h2> <code><?php print_unescaped(OC_Helper::linkToRemote('webdav')); ?></code><br /> <em><?php print_unescaped($l->t('Use this address to <a href="%s" target="_blank">access your Files via WebDAV</a>', array(link_to_docs('user-webdav'))));?></em> -</fieldset> +</div> <?php foreach($_['forms'] as $form) { print_unescaped($form); };?> <?php if($_['enableDecryptAll']): ?> -<fieldset class="personalblock" id="decryptAll"> +<div class="section" id="decryptAll"> <h2> <?php p( $l->t( 'Encryption' ) ); ?> </h2> @@ -174,18 +164,17 @@ if($_['passwordChangeSupported']) { <span class="msg"></span> </p> <br /> -</fieldset> +</div> <?php endif; ?> -<fieldset class="personalblock"> +<div class="section"> <h2><?php p($l->t('Version'));?></h2> <strong><?php p($theme->getName()); ?></strong> <?php p(OC_Util::getHumanVersion()) ?><br /> <?php if (OC_Util::getEditionString() === ''): ?> <?php print_unescaped($l->t('Developed by the <a href="http://ownCloud.org/contact" target="_blank">ownCloud community</a>, the <a href="https://github.com/owncloud" target="_blank">source code</a> is licensed under the <a href="http://www.gnu.org/licenses/agpl-3.0.html" target="_blank"><abbr title="Affero General Public License">AGPL</abbr></a>.')); ?> <?php endif; ?> -</fieldset> -<fieldset class="personalblock credits-footer"> -<p> - <?php print_unescaped($theme->getShortFooter()); ?> -</p> -</fieldset> +</div> + +<div class="section credits-footer"> + <p><?php print_unescaped($theme->getShortFooter()); ?></p> +</div> |