Merge branch 'master' into sharing. Integrate with changes in master, rename classes
Conflicts: lib/base.phpremotes/origin/stable
Michael Gapczynski
commit
11d1627513
@ -0,0 +1,28 @@
|
||||
[main]
|
||||
host = https://www.transifex.net
|
||||
|
||||
[owncloud.admin]
|
||||
file_filter = l10n/<lang>/admin.po
|
||||
source_file = l10n/templates/admin.pot
|
||||
source_lang = en
|
||||
|
||||
[owncloud.core]
|
||||
file_filter = l10n/<lang>/core.po
|
||||
source_file = l10n/templates/core.pot
|
||||
source_lang = en
|
||||
|
||||
[owncloud.help]
|
||||
file_filter = l10n/<lang>/help.po
|
||||
source_file = l10n/templates/help.pot
|
||||
source_lang = en
|
||||
|
||||
[owncloud.log]
|
||||
file_filter = l10n/<lang>/log.po
|
||||
source_file = l10n/templates/log.pot
|
||||
source_lang = en
|
||||
|
||||
[owncloud.settings]
|
||||
file_filter = l10n/<lang>/settings.po
|
||||
source_file = l10n/templates/settings.pot
|
||||
source_lang = en
|
||||
|
||||
@ -1,12 +1,12 @@
|
||||
<?php
|
||||
|
||||
OC_APP::register( array( "order" => 1, "id" => "admin", "name" => "Administration" ));
|
||||
OC_App::register( array( "order" => 1, "id" => "admin", "name" => "Administration" ));
|
||||
|
||||
// OC_APP::addAdminPage( array( "id" => "core_system", "order" => 1, "href" => OC_HELPER::linkTo( "admin", "system.php" ), "name" =>"System", "icon" => OC_HELPER::imagePath( "admin", "administration.png" )));
|
||||
OC_APP::addAdminPage( array( "id" => "core_users", "order" => 2, "href" => OC_HELPER::linkTo( "admin", "users.php" ), "name" => "Users", "icon" => OC_HELPER::imagePath( "admin", "users.png" )));
|
||||
OC_APP::addAdminPage( array( "id" => "core_apps", "order" => 3, "href" => OC_HELPER::linkTo( "admin", "apps.php?installed" ), "name" => "Apps", "icon" => OC_HELPER::imagePath( "admin", "apps.png" )));
|
||||
// OC_App::addAdminPage( array( "id" => "core_system", "order" => 1, "href" => OC_Helper::linkTo( "admin", "system.php" ), "name" =>"System", "icon" => OC_Helper::imagePath( "admin", "administration.png" )));
|
||||
OC_App::addAdminPage( array( "id" => "core_users", "order" => 2, "href" => OC_Helper::linkTo( "admin", "users.php" ), "name" => "Users", "icon" => OC_Helper::imagePath( "admin", "users.png" )));
|
||||
OC_App::addAdminPage( array( "id" => "core_apps", "order" => 3, "href" => OC_Helper::linkTo( "admin", "apps.php?installed" ), "name" => "Apps", "icon" => OC_Helper::imagePath( "admin", "apps.png" )));
|
||||
|
||||
// Add subentries for App installer
|
||||
OC_APP::addNavigationSubEntry( "core_apps", array( "id" => "core_apps_get", "order" => 4, "href" => OC_HELPER::linkTo( "admin", "apps.php" ), "name" => "Get new apps", "icon" => OC_HELPER::imagePath( "admin", "navicon.png" )));
|
||||
OC_App::addNavigationSubEntry( "core_apps", array( "id" => "core_apps_get", "order" => 4, "href" => OC_Helper::linkTo( "admin", "apps.php" ), "name" => "Get new apps", "icon" => OC_Helper::imagePath( "admin", "navicon.png" )));
|
||||
|
||||
?>
|
||||
|
||||
@ -0,0 +1,20 @@
|
||||
<?php $TRANSLATIONS = array(
|
||||
"read more" => "en lire plus",
|
||||
"INSTALL" => "INSTALLATION",
|
||||
"Apps Repository" => "Répertoire d'applications",
|
||||
"Cannot connect to apps repository" => "Impossible de se connecter au répertoire d'applications",
|
||||
"Name" => "Nom",
|
||||
"Modified" => "Modifié le",
|
||||
"Administration" => "Administration",
|
||||
"System Settings" => "Préférences Système",
|
||||
"Users" => "Utilisateurs",
|
||||
"Groups" => "Groupes",
|
||||
"Password" => "Mot de passe",
|
||||
"Create" => "Créer",
|
||||
"remove" => "retirer",
|
||||
"Create group" => "Créer un groupe",
|
||||
"Force new password:" => "Forcer un nouveau mot de passe :",
|
||||
"Set" => "Appliquer",
|
||||
"Do you really want to delete user" => "Voulez-vous réellement supprimer cet utilisateur",
|
||||
"Do you really want to delete group" => "Voulez-vous réellement supprimer ce groupe"
|
||||
);
|
||||
@ -1,8 +1,8 @@
|
||||
<?php
|
||||
|
||||
if(OC_APP::getCurrentApp()=='files'){
|
||||
OC_UTIL::addScript( 'files_imageviewer', 'lightbox' );
|
||||
OC_UTIL::addStyle( 'files_imageviewer', 'lightbox' );
|
||||
if(OC_App::getCurrentApp()=='files'){
|
||||
OC_Util::addScript( 'files_imageviewer', 'lightbox' );
|
||||
OC_Util::addStyle( 'files_imageviewer', 'lightbox' );
|
||||
}
|
||||
|
||||
?>
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
<?php
|
||||
|
||||
OC_APP::addSettingsPage( array( "id" => "files_publiclink_administration", "order" => 1, "href" => OC_HELPER::linkTo( "files_publiclink", "admin.php" ), "name" => "Public Links", "icon" => OC_HELPER::imagePath( "files_publiclink", "share.png" )));
|
||||
OC_App::addSettingsPage( array( "id" => "files_publiclink_administration", "order" => 1, "href" => OC_Helper::linkTo( "files_publiclink", "admin.php" ), "name" => "Public Links", "icon" => OC_Helper::imagePath( "files_publiclink", "share.png" )));
|
||||
|
||||
|
||||
?>
|
||||
|
||||
@ -0,0 +1,150 @@
|
||||
Collection={
|
||||
artists:[],
|
||||
loaded:false,
|
||||
loading:false,
|
||||
loadedListeners:[],
|
||||
load:function(ready){
|
||||
if(ready){
|
||||
Collection.loadedListeners.push(ready);
|
||||
}
|
||||
if(!Collection.loading){
|
||||
Collection.loading=true;
|
||||
$.ajax({
|
||||
url: OC.linkTo('media','ajax/api.php')+'?action=get_collection',
|
||||
dataType: 'json',
|
||||
success: function(collection){
|
||||
Collection.artists=collection;
|
||||
|
||||
//set the album and artist fieds for the songs
|
||||
for(var i=0;i<collection.length;i++){
|
||||
var artist=collection[i];
|
||||
for(var j=0;j<artist.albums.length;j++){
|
||||
var album=artist.albums[j]
|
||||
for(var w=0;w<album.songs.length;w++){
|
||||
album.songs[w].album_name=album.album_name;
|
||||
album.songs[w].artist_name=artist.artist_name;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
Collection.loaded=true;
|
||||
Collection.loading=false;
|
||||
for(var i=0;i<Collection.loadedListeners.length;i++){
|
||||
Collection.loadedListeners[i]();
|
||||
}
|
||||
|
||||
}
|
||||
});
|
||||
}
|
||||
},
|
||||
display:function(){
|
||||
if(Collection.parent){
|
||||
Collection.parent.show();
|
||||
}
|
||||
if(!Collection.loaded){
|
||||
Collection.load(Collection.display)
|
||||
}else{
|
||||
if(Collection.parent){
|
||||
Collection.parent.children('li.artist').remove();
|
||||
var template=Collection.parent.children('li.template');
|
||||
for(var i=0;i<Collection.artists.length;i++){
|
||||
var artist=Collection.artists[i];
|
||||
var li=template.clone();
|
||||
li.data('artist',artist);
|
||||
li.removeClass('template');
|
||||
li.addClass('artist');
|
||||
li.data('type','artist');
|
||||
li.children('span').text(artist.artist_name);
|
||||
Collection.addButtons(li);
|
||||
Collection.parent.append(li);
|
||||
}
|
||||
}
|
||||
}
|
||||
},
|
||||
parent:null,
|
||||
hide:function(){
|
||||
if(Collection.parent){
|
||||
Collection.parent.hide();
|
||||
}
|
||||
},
|
||||
showAlbums:function(artistLi){
|
||||
$('ul.albums').parent().removeClass('active');
|
||||
$('ul.albums').remove();
|
||||
var artist=artistLi.data('artist');
|
||||
if(artist){
|
||||
var template=Collection.parent.children('li.template');
|
||||
var ul=$('<ul class="albums"></ul>');
|
||||
for(var i=0;i<artist.albums.length;i++){
|
||||
var li=template.clone();
|
||||
var album=artist.albums[i];
|
||||
li.removeClass('template');
|
||||
li.addClass('album');
|
||||
li.data('album',album);
|
||||
li.data('type','album');
|
||||
li.children('span').text(album.album_name);
|
||||
Collection.addButtons(li);
|
||||
ul.append(li);
|
||||
}
|
||||
artistLi.append(ul);
|
||||
}
|
||||
},
|
||||
showSongs:function(albumLi){
|
||||
$('ul.songs').parent().removeClass('active');
|
||||
$('ul.songs').remove();
|
||||
var album=albumLi.data('album');
|
||||
var template=Collection.parent.children('li.template');
|
||||
var ul=$('<ul class="songs"></ul>');
|
||||
for(var i=0;i<album.songs.length;i++){
|
||||
var li=template.clone();
|
||||
var song=album.songs[i];
|
||||
li.removeClass('template');
|
||||
li.addClass('song');
|
||||
li.data('song',song);
|
||||
li.data('type','song');
|
||||
li.children('span').text(song.song_name);
|
||||
Collection.addButtons(li);
|
||||
ul.append(li);
|
||||
}
|
||||
albumLi.append(ul);
|
||||
},
|
||||
registerPlay:function(){
|
||||
var item=PlayList.items[PlayList.current];
|
||||
for(var i=0;i<Collection.artists.length;i++){
|
||||
var artist=Collection.artists[i];
|
||||
for(var j=0;j<artist.albums.length;j++){
|
||||
var album=artist.albums[j]
|
||||
for(var w=0;w<album.songs.length;w++){
|
||||
var song=album.songs[w];
|
||||
if(song.song_name==item.name && song.artist_name==item.artist && song.album_name==item.album){
|
||||
song.song_playcount++;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
},
|
||||
addButtons:function(parent){
|
||||
parent.children('button.add').click(function(){
|
||||
var type=$(this).parent().data('type');
|
||||
PlayList.add($(this).parent().data(type));
|
||||
});
|
||||
parent.children('button.play').click(function(){
|
||||
var type=$(this).parent().data('type');
|
||||
var oldSize=PlayList.items.length;
|
||||
PlayList.add($(this).parent().data(type));
|
||||
PlayList.play(oldSize);
|
||||
});
|
||||
}
|
||||
}
|
||||
|
||||
$(document).ready(function(){
|
||||
Collection.parent=$('#collection');
|
||||
Collection.load();
|
||||
$('#collection li.artist>span').live('click',function(){
|
||||
$(this).parent().toggleClass('active');
|
||||
Collection.showAlbums($(this).parent());
|
||||
});
|
||||
$('#collection li.album>span').live('click',function(){
|
||||
$(this).parent().toggleClass('active');
|
||||
Collection.showSongs($(this).parent());
|
||||
});
|
||||
});
|
||||
@ -0,0 +1,141 @@
|
||||
PlayList.render=function(){
|
||||
$('#playlist').show();
|
||||
PlayList.parent.empty();
|
||||
for(var i=0;i<PlayList.items.length;i++){
|
||||
var tr=PlayList.template.clone();
|
||||
var item=PlayList.items[i];
|
||||
if(i==PlayList.current){
|
||||
tr.addClass('current');
|
||||
}
|
||||
tr.removeClass('template');
|
||||
tr.data('name',item.name);
|
||||
tr.data('artist',item.artist);
|
||||
tr.data('album',item.album);
|
||||
tr.data('time',item.length);
|
||||
tr.data('plays',item.playcount);
|
||||
tr.children('td.name').children('span').text(item.name);
|
||||
tr.children('td.artist').text(item.artist);
|
||||
tr.children('td.album').text(item.album);
|
||||
var secconds=(item.length%60);
|
||||
if(secconds<10){
|
||||
secconds='0'+secconds;
|
||||
}
|
||||
var length=Math.floor(item.length/60)+':'+secconds;
|
||||
tr.children('td.time').text(length);
|
||||
tr.children('td.plays').text(item.playcount);
|
||||
tr.data('index',i);
|
||||
tr.click(function(){
|
||||
PlayList.play($(this).data('index'));
|
||||
PlayList.render();
|
||||
});
|
||||
tr.hover(function(){
|
||||
var button=$('<img class="remove" title="Remove"/>');
|
||||
button.attr('src',OC.imagePath('core','actions/delete'));
|
||||
$(this).children().last().append(button);
|
||||
button.click(function(event){
|
||||
event.stopPropagation();
|
||||
event.preventDefault();
|
||||
var index=$(this).parent().parent().data('index');
|
||||
PlayList.remove(index);
|
||||
});
|
||||
},function(){
|
||||
$(this).children().last().children('img.remove').remove();
|
||||
});
|
||||
tr.children('td.name').children('input').click(function(event){
|
||||
event.stopPropagation();
|
||||
if($(this).attr('checked')){
|
||||
$(this).parent().parent().addClass('selected');
|
||||
if($('tbody td.name input:checkbox').length==$('tbody td.name input:checkbox:checked').length){
|
||||
$('#selectAll').attr('checked',true);
|
||||
}
|
||||
}else{
|
||||
$(this).parent().parent().removeClass('selected');
|
||||
$('#selectAll').attr('checked',false);
|
||||
}
|
||||
procesSelection();
|
||||
});
|
||||
PlayList.parent.append(tr);
|
||||
}
|
||||
}
|
||||
PlayList.getSelected=function(){
|
||||
return $('tbody td.name input:checkbox:checked').parent().parent();
|
||||
}
|
||||
PlayList.hide=function(){
|
||||
$('#playlist').hide();
|
||||
}
|
||||
|
||||
$(document).ready(function(){
|
||||
PlayList.parent=$('#playlist tbody');
|
||||
PlayList.template=$('#playlist tr.template');
|
||||
$('#selectAll').click(function(){
|
||||
if($(this).attr('checked')){
|
||||
// Check all
|
||||
$('tbody td.name input:checkbox').attr('checked', true);
|
||||
$('tbody td.name input:checkbox').parent().parent().addClass('selected');
|
||||
}else{
|
||||
// Uncheck all
|
||||
$('tbody td.name input:checkbox').attr('checked', false);
|
||||
$('tbody td.name input:checkbox').parent().parent().removeClass('selected');
|
||||
}
|
||||
procesSelection();
|
||||
});
|
||||
});
|
||||
|
||||
function procesSelection(){
|
||||
var selected=PlayList.getSelected();
|
||||
if(selected.length==0){
|
||||
$('th.name span').text('Name');
|
||||
$('th.artist').text('Artist');
|
||||
$('th.album').text('Album');
|
||||
$('th.time').text('Time');
|
||||
$('th.plays').empty();
|
||||
$('th.plays').text('Plays');
|
||||
}else{
|
||||
var name=selected.length+' selected';
|
||||
var artist=$(selected[0]).data('artist');
|
||||
var album=$(selected[0]).data('album');
|
||||
var time=$(selected[0]).data('time');
|
||||
var plays=$(selected[0]).data('plays');
|
||||
for(var i=1;i<selected.length;i++){
|
||||
var item=$(selected[i]);
|
||||
if(artist!='mixed' && item.data('artist')!==artist){
|
||||
artist='mixed'
|
||||
}
|
||||
if(album!='mixed' && item.data('album')!==album){
|
||||
album='mixed'
|
||||
}
|
||||
if(time!='mixed' && item.data('time')!==time){
|
||||
time='mixed'
|
||||
}
|
||||
if(plays!='mixed' && item.data('plays')!==plays){
|
||||
plays='mixed'
|
||||
}
|
||||
}
|
||||
$('th.name span').text(name);
|
||||
$('th.artist').text(artist);
|
||||
$('th.album').text(album);
|
||||
if(time!='mixed'){
|
||||
var secconds=(time%60);
|
||||
if(secconds<10){
|
||||
secconds='0'+secconds;
|
||||
}
|
||||
var time=Math.floor(time/60)+':'+secconds;
|
||||
}
|
||||
$('th.time').text(time);
|
||||
$('th.plays').text(plays);
|
||||
var button=$('<img class="remove" title="Remove"/>');
|
||||
button.attr('src',OC.imagePath('core','actions/delete'));
|
||||
$('th.plays').append(button);
|
||||
button.click(function(event){
|
||||
event.stopPropagation();
|
||||
event.preventDefault();
|
||||
PlayList.getSelected().each(function(index,element){
|
||||
var index=$(element).data('index');
|
||||
PlayList.items[index]=null;
|
||||
});
|
||||
PlayList.items=PlayList.items.filter(function(item){return item!==null});
|
||||
PlayList.render();
|
||||
procesSelection();
|
||||
});
|
||||
}
|
||||
}
|
||||
@ -0,0 +1,10 @@
|
||||
<ul id='collection'>
|
||||
<li class='artist'>
|
||||
<img src="<?php echo image_path('files','loading.gif') ?>" alt='loading'/>Loading Collection...
|
||||
</li>
|
||||
<li class='template'>
|
||||
<span></span>
|
||||
<button class='add'>Add</button>
|
||||
<button class='play'>Play</button>
|
||||
</li>
|
||||
</ul>
|
||||
@ -1,3 +1,3 @@
|
||||
<?php echo $_['player'];?>
|
||||
<div id='collection'><ul/></div>
|
||||
<ul id="playlist"/>
|
||||
<?php echo $_['collection'];?>
|
||||
<?php echo $_['playlist'];?>
|
||||
|
||||
@ -0,0 +1,30 @@
|
||||
<table id='playlist'>
|
||||
<thead>
|
||||
<tr>
|
||||
<th class='name'><input id='selectAll' type='checkbox'>Name</th>
|
||||
<th class='artist'>Artist</th>
|
||||
<th class='album'>Album</th>
|
||||
<th class='time'>Time</th>
|
||||
<th class='plays'>Plays</th>
|
||||
</tr>
|
||||
</thead>
|
||||
<tbody>
|
||||
<tr>
|
||||
<td>
|
||||
The playlist is empty
|
||||
</td>
|
||||
</tr>
|
||||
</tbody>
|
||||
<tfoot>
|
||||
<tr class='template'>
|
||||
<td class='name'>
|
||||
<input type='checkbox'>
|
||||
<span></span>
|
||||
</td>
|
||||
<td class='artist'></td>
|
||||
<td class='album'></td>
|
||||
<td class='time'></td>
|
||||
<td class='plays'></td>
|
||||
</tr>
|
||||
</tfoot>
|
||||
</table>
|
||||
@ -1,27 +1,28 @@
|
||||
<?php $TRANSLATIONS = array(
|
||||
"Error 404, Cloud not found" => "Cloud konnte nicht gefunden werden.",
|
||||
"Welcome to <strong>ownCloud</strong>, your personnal cloud." => "Willkommen bei <strong>ownCloud</strong>, deinem persönlichen Online-Speicher.",
|
||||
"To finish the installation, please follow the steps below." => "Die Installation ist fast abgeschlossen.",
|
||||
"Create an <strong>admin account.</strong>" => "<strong>Verwaltungskonto</strong> erstellen.",
|
||||
"Login:" => "Benutzername:",
|
||||
"Password:" => "Passwort:",
|
||||
"<strong>ownCloud</strong> is your personal web storage." => "<strong>ownCloud</strong> ist dein persönlicher Online-Speicher.",
|
||||
"Finish the setup by following the steps below." => "Die Installation ist fast abgeschlossen.",
|
||||
"Create an <strong>admin account</strong>." => "<strong>Verwalter-Konto</strong> erstellen",
|
||||
"Username" => "Nutzername",
|
||||
"Password" => "Passwort",
|
||||
"Advanced" => "Erweitert",
|
||||
"Set where to store the data." => "Speicherort der Daten",
|
||||
"Data directory:" => "Datenverzeichnis:",
|
||||
"Configure your database." => "Datenbank einstellen.",
|
||||
"I will use a SQLite database. You have nothing to do!" => "Es wird eine SQLite-Datenbank genutzt.",
|
||||
"Configure the database." => "Datenbank einrichten",
|
||||
"SQLite will be used for the database. You have nothing to do." => "SQLite wird als Datenbank genutzt.",
|
||||
"SQLite" => "SQLite",
|
||||
"I will use a MySQL database." => "Es wird eine MySQL-Datenbank genutzt.",
|
||||
"Host:" => "Host:",
|
||||
"MySQL will be used for the database." => "MySQL wird als Datenbank genutzt.",
|
||||
"MySQL username:" => "MySQL-Nutzername:",
|
||||
"MySQL password:" => "MySQL-Passwort:",
|
||||
"Database name:" => "Datenbankname:",
|
||||
"Host:" => "Host:",
|
||||
"Table prefix:" => "Tabellenpräfix:",
|
||||
"MySQL user login:" => "MySQL-Nutzername:",
|
||||
"MySQL user password:" => "MySQL-Passwort:",
|
||||
"Finish setup" => "Installation abschließen",
|
||||
"<a href=\"http://owncloud.org/\">ownCloud</a> is a personal cloud which runs on your own server.</p>" => "<a href=\"http://owncloud.org/\">ownCloud</a> ist ein privater Online-Speicher für deinen eigenen Server.</p>",
|
||||
"Login failed!" => "Anmeldung Fehlgeschlagen!",
|
||||
"You are logged out." => "Sie wurden abgemeldet.",
|
||||
"prev" => "zurück",
|
||||
"next" => "weiter",
|
||||
"Search" => "Suchen",
|
||||
"Finish setup" => "Installation abschließen"
|
||||
"Login failed!" => "Anmeldung fehlgeschlagen!",
|
||||
"Remember login" => "Anmeldung merken",
|
||||
"You are logged out." => "Erfolgreich abgemeldet.",
|
||||
"prev" => "Zurück",
|
||||
"next" => "Weiter",
|
||||
"Search" => "Suchen"
|
||||
);
|
||||
|
||||
@ -0,0 +1,28 @@
|
||||
<?php $TRANSLATIONS = array(
|
||||
"Error 404, Cloud not found" => "Erreur 404, la page demandée n'existe pas",
|
||||
"<strong>ownCloud</strong> is your personal web storage." => "<strong>ownCloud</strong> est votre espace de stockage web personnel.",
|
||||
"Finish the setup by following the steps below." => "Terminez l'installation en suivant les étapes ci-dessous.",
|
||||
"Create an <strong>admin account</strong>." => "Veuillez créer un <strong>compte administrateur.</strong>",
|
||||
"Username" => "Nom d'utilisateur",
|
||||
"Password" => "Mot de passe",
|
||||
"Advanced" => "Avancé",
|
||||
"Set where to store the data." => "Sélectionnez où sauvegarder les données",
|
||||
"Data directory:" => "Répertoire de données",
|
||||
"Configure the database." => "Configurez la base de données.",
|
||||
"SQLite will be used for the database. You have nothing to do." => "SQLite sera utilisé comme moteur pour la base de données. Vous n'avez rien de plus à faire.",
|
||||
"SQLite" => "SQLite",
|
||||
"MySQL will be used for the database." => "MySQL sera utilisé comme moteur pour la base de données.",
|
||||
"MySQL username:" => "Nom d'utilisateur MySQL :",
|
||||
"MySQL password:" => "Mot de passe MySQL :",
|
||||
"Database name:" => "Nom de la base de données :",
|
||||
"Host:" => "Hôte :",
|
||||
"Table prefix:" => "Préfixe de table :",
|
||||
"Finish setup" => "Terminer l'installation",
|
||||
"<a href=\"http://owncloud.org/\">ownCloud</a> is a personal cloud which runs on your own server.</p>" => "<a href=\"http://owncloud.org/\">ownCloud</a> est votre solution cloud personnelle qui tourne sur votre propre serveur.</p>",
|
||||
"Login failed!" => "Échec de la connexion !",
|
||||
"Remember login" => "Se souvenir de moi",
|
||||
"You are logged out." => "Vous êtes désormais déconnecté.",
|
||||
"prev" => "précédent",
|
||||
"next" => "suivant",
|
||||
"Search" => "Rechercher"
|
||||
);
|
||||
@ -1,19 +1,18 @@
|
||||
<?php
|
||||
if(!isset($_)){//also provide standalone error page
|
||||
require_once '../../lib/base.php';
|
||||
require( 'template.php' );
|
||||
|
||||
$tmpl = new OC_TEMPLATE( '', '404', 'guest' );
|
||||
$tmpl = new OC_Template( '', '404', 'guest' );
|
||||
$tmpl->printPage();
|
||||
exit;
|
||||
}
|
||||
?>
|
||||
<div id="login">
|
||||
<img src="<?php echo image_path("", "weather-clear.png"); ?>" alt="ownCloud" />
|
||||
<header><img src="<?php echo image_path('', 'weather-clear.png'); ?>" alt="ownCloud" /></header>
|
||||
<ul>
|
||||
<li class='error'>
|
||||
<?php echo $l->t( 'Error 404, Cloud not found' ); ?><br/>
|
||||
<p class='hint'><?php if(isset($_['file'])) echo $_['file']?></p>
|
||||
</li>
|
||||
</ul>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
@ -1,3 +1,3 @@
|
||||
<form class="searchbox" action="<?php echo $_['searchurl']?>" method="post">
|
||||
<input type="search" name="query" value="<?php if(isset($_POST['query'])){echo $_POST['query'];};?>" class="prettybutton" />
|
||||
<input id='searchbox' type="search" name="query" value="<?php if(isset($_POST['query'])){echo $_POST['query'];};?>" class="prettybutton" />
|
||||
</form>
|
||||
|
||||
@ -1,12 +1,12 @@
|
||||
<?php
|
||||
|
||||
OC_APP::register( array( "order" => 2, "id" => "files", "name" => "Files" ));
|
||||
OC_App::register( array( "order" => 2, "id" => "files", "name" => "Files" ));
|
||||
|
||||
OC_APP::addNavigationEntry( array( "id" => "files_index", "order" => 1, "href" => OC_HELPER::linkTo( "files", "index.php" ), "icon" => OC_HELPER::imagePath( "files", "home.png" ), "name" => "Files" ));
|
||||
OC_APP::addAdminPage( array( "id" => "files_administration", "order" => 3, "href" => OC_HELPER::linkTo( "files", "admin.php" ), "name" => "Files", "icon" => OC_HELPER::imagePath( "files", "folder.png" )));
|
||||
OC_App::addNavigationEntry( array( "id" => "files_index", "order" => 1, "href" => OC_Helper::linkTo( "files", "index.php" ), "icon" => OC_Helper::imagePath( "files", "home.png" ), "name" => "Files" ));
|
||||
OC_App::addAdminPage( array( "id" => "files_administration", "order" => 3, "href" => OC_Helper::linkTo( "files", "admin.php" ), "name" => "Files", "icon" => OC_Helper::imagePath( "files", "folder.png" )));
|
||||
|
||||
|
||||
// To add navigation sub entries use
|
||||
// OC_APP::addNavigationSubEntry( "files_index", array( ... ));
|
||||
// OC_App::addNavigationSubEntry( "files_index", array( ... ));
|
||||
|
||||
?>
|
||||
|
||||
@ -1,14 +1,14 @@
|
||||
<?php
|
||||
|
||||
OC_APP::register( array( "order" => 1, "id" => "help", "name" => "Help" ));
|
||||
OC_App::register( array( "order" => 1, "id" => "help", "name" => "Help" ));
|
||||
|
||||
// Workaround for having help as the last entry always
|
||||
$entry = array( "id" => "help", "order" => 1000, "href" => OC_HELPER::linkTo( "help", "index.php" ), "name" => "Help", "icon" => OC_HELPER::imagePath( "help", "help.png" ));
|
||||
if( isset( $_SESSION["user_id"] ) && OC_GROUP::inGroup( $_SESSION["user_id"], "admin" )){
|
||||
OC_APP::addAdminPage( $entry );
|
||||
$entry = array( "id" => "help", "order" => 1000, "href" => OC_Helper::linkTo( "help", "index.php" ), "name" => "Help", "icon" => OC_Helper::imagePath( "help", "help.png" ));
|
||||
if( isset( $_SESSION["user_id"] ) && OC_Group::inGroup( $_SESSION["user_id"], "admin" )){
|
||||
OC_App::addAdminPage( $entry );
|
||||
}
|
||||
else{
|
||||
OC_APP::addSettingsPage( $entry );
|
||||
OC_App::addSettingsPage( $entry );
|
||||
}
|
||||
|
||||
?>
|
||||
|
||||
@ -0,0 +1,4 @@
|
||||
<?php $TRANSLATIONS = array(
|
||||
"Questions and Answers" => "Въпроси и отговори",
|
||||
"ASK A QUESTION" => "ЗАДАЙТЕ ВЪПРОС"
|
||||
);
|
||||
@ -0,0 +1,4 @@
|
||||
<?php $TRANSLATIONS = array(
|
||||
"Questions and Answers" => "Questions / Réponses",
|
||||
"ASK A QUESTION" => "Poser une question"
|
||||
);
|
||||
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in New Issue