diff options
author | Jan-Christoph Borchardt <JanCBorchardt@fsfe.org> | 2011-08-13 06:04:48 +0400 |
---|---|---|
committer | Jan-Christoph Borchardt <JanCBorchardt@fsfe.org> | 2011-08-13 07:13:34 +0400 |
commit | 4a5ee765cf5030c7d92d88687e886079f6bafb1e (patch) | |
tree | 0b87acdf2f21f56dc1b97b063121899f3cae87bc | |
parent | 67156f87e3757fbd5e692e7d6b2209cfafc6c3cf (diff) |
merged admin, help and settings to settings
-rw-r--r-- | admin/ajax/changepassword.php | 26 | ||||
-rw-r--r-- | admin/appinfo/app.php | 5 | ||||
-rw-r--r-- | admin/css/apps.css | 3 | ||||
-rw-r--r-- | admin/css/users.css | 13 | ||||
-rw-r--r-- | admin/l10n/da.php | 19 | ||||
-rw-r--r-- | admin/l10n/de.php | 20 | ||||
-rw-r--r-- | admin/l10n/es.php | 20 | ||||
-rw-r--r-- | admin/l10n/fr.php | 20 | ||||
-rw-r--r-- | admin/l10n/nl.php | 19 | ||||
-rw-r--r-- | admin/l10n/pl.php | 19 | ||||
-rw-r--r-- | admin/system.php | 36 | ||||
-rw-r--r-- | admin/templates/system.php | 2 | ||||
-rw-r--r-- | apps/contacts/appinfo/app.php | 2 | ||||
-rw-r--r-- | help/appinfo/app.php | 5 | ||||
-rw-r--r-- | help/css/help.css | 10 | ||||
-rw-r--r-- | help/l10n/bg_BG.php | 4 | ||||
-rw-r--r-- | help/l10n/da.php | 4 | ||||
-rw-r--r-- | help/l10n/de.php | 4 | ||||
-rw-r--r-- | help/l10n/es.php | 4 | ||||
-rw-r--r-- | help/l10n/fr.php | 4 | ||||
-rw-r--r-- | help/l10n/nl.php | 4 | ||||
-rw-r--r-- | help/l10n/pl.php | 4 | ||||
-rw-r--r-- | lib/app.php | 10 | ||||
-rw-r--r-- | settings/ajax/changepassword.php | 31 | ||||
-rw-r--r-- | settings/ajax/creategroup.php (renamed from admin/ajax/creategroup.php) | 0 | ||||
-rw-r--r-- | settings/ajax/createuser.php (renamed from admin/ajax/createuser.php) | 0 | ||||
-rw-r--r-- | settings/ajax/disableapp.php (renamed from admin/ajax/disableapp.php) | 0 | ||||
-rw-r--r-- | settings/ajax/enableapp.php (renamed from admin/ajax/enableapp.php) | 0 | ||||
-rw-r--r-- | settings/ajax/removegroup.php (renamed from admin/ajax/removegroup.php) | 0 | ||||
-rw-r--r-- | settings/ajax/removeuser.php (renamed from admin/ajax/removeuser.php) | 0 | ||||
-rw-r--r-- | settings/ajax/togglegroups.php (renamed from admin/ajax/togglegroups.php) | 0 | ||||
-rw-r--r-- | settings/appinfo/app.php | 2 | ||||
-rw-r--r-- | settings/apps.php (renamed from admin/apps.php) | 7 | ||||
-rw-r--r-- | settings/css/settings.css | 28 | ||||
-rw-r--r-- | settings/help.php (renamed from help/index.php) | 4 | ||||
-rw-r--r-- | settings/img/apps.png (renamed from admin/img/apps.png) | bin | 255 -> 255 bytes | |||
-rw-r--r-- | settings/img/apps.svg (renamed from admin/img/apps.svg) | 0 | ||||
-rw-r--r-- | settings/img/help.png (renamed from help/img/help.png) | bin | 474 -> 474 bytes | |||
-rw-r--r-- | settings/img/help.svg (renamed from help/img/help.svg) | 0 | ||||
-rw-r--r-- | settings/img/users.png (renamed from admin/img/users.png) | bin | 743 -> 743 bytes | |||
-rw-r--r-- | settings/img/users.svg (renamed from admin/img/users.svg) | 0 | ||||
-rw-r--r-- | settings/js/apps.js (renamed from admin/js/apps.js) | 0 | ||||
-rw-r--r-- | settings/js/personal.js (renamed from settings/js/main.js) | 0 | ||||
-rw-r--r-- | settings/js/users.js (renamed from admin/js/users.js) | 0 | ||||
-rw-r--r-- | settings/personal.php (renamed from settings/index.php) | 6 | ||||
-rw-r--r-- | settings/templates/apps.php (renamed from admin/templates/apps.php) | 0 | ||||
-rw-r--r-- | settings/templates/help.php (renamed from help/templates/index.php) | 2 | ||||
-rw-r--r-- | settings/templates/personal.php (renamed from settings/templates/index.php) | 0 | ||||
-rw-r--r-- | settings/templates/users.php (renamed from admin/templates/users.php) | 4 | ||||
-rw-r--r-- | settings/users.php (renamed from admin/users.php) | 6 |
50 files changed, 60 insertions, 287 deletions
diff --git a/admin/ajax/changepassword.php b/admin/ajax/changepassword.php deleted file mode 100644 index 98c2a8b37a1..00000000000 --- a/admin/ajax/changepassword.php +++ /dev/null @@ -1,26 +0,0 @@ -<?php - -// Init owncloud -require_once('../../lib/base.php'); - -// We send json data -header( "Content-Type: application/jsonrequest" ); - -// Check if we are a user -if( !OC_User::isLoggedIn() || !OC_Group::inGroup( OC_User::getUser(), 'admin' )){ - echo json_encode( array( "status" => "error", "data" => array( "message" => "Authentication error" ))); - exit(); -} - -$username = $_POST["username"]; -$password = $_POST["password"]; - -// Return Success story -if( OC_User::setPassword( $username, $password )){ - echo json_encode( array( "status" => "success", "data" => array( "username" => $username ))); -} -else{ - echo json_encode( array( "status" => "error", "data" => array( "message" => "Unable to change password" ))); -} - -?> diff --git a/admin/appinfo/app.php b/admin/appinfo/app.php deleted file mode 100644 index 80850638f71..00000000000 --- a/admin/appinfo/app.php +++ /dev/null @@ -1,5 +0,0 @@ -<?php - -OC_App::register( array( "order" => 1, "id" => "admin", "name" => "Administration" )); - -?> diff --git a/admin/css/apps.css b/admin/css/apps.css deleted file mode 100644 index 6106ff3f7ec..00000000000 --- a/admin/css/apps.css +++ /dev/null @@ -1,3 +0,0 @@ -li{color:#888} -li.active{color:#000} -span.version{margin-left:3em;color:#ddd} diff --git a/admin/css/users.css b/admin/css/users.css deleted file mode 100644 index 977e06e41c6..00000000000 --- a/admin/css/users.css +++ /dev/null @@ -1,13 +0,0 @@ -form { display:inline; } -td.name, td.password { padding-left:.8em; } -td.password>img, td.remove>img { display:none; cursor:pointer; } -td.password>span { margin-right:1.2em; } -td.password { width:12em; cursor:pointer; } - -td.remove { width:1em; } -tr:hover>td.password>span { margin:0; cursor:pointer; } -tr:hover>td.remove>img, tr:hover>td.password>img { display:inline; cursor:pointer; } -tr:hover>td.remove>img { float:right; } -li.selected { background-color:#ddd; } -#content>table { margin-top:6.5em; } -table { width:100%; } diff --git a/admin/l10n/da.php b/admin/l10n/da.php deleted file mode 100644 index 467c259dc37..00000000000 --- a/admin/l10n/da.php +++ /dev/null @@ -1,19 +0,0 @@ -<?php $TRANSLATIONS = array( -"read more" => "læs mere", -"INSTALL" => "INSTALLER", -"Apps Repository" => "Applikation arkiv", -"Cannot connect to apps repository" => "Kan ikke oprette forbindelse til applikations arkivet", -"Name" => "Navn", -"Modified" => "Ændret", -"Administration" => "Administration", -"System Settings" => "System indstillinger", -"Users" => "Brugere", -"Groups" => "Grupper", -"Password" => "Kodeord", -"remove" => "slet", -"Create group" => "Lav gruppe", -"Force new password:" => "Tving ny adgangskode", -"Set" => "Indstil", -"Do you really want to delete user" => "Vil du virkelig slette denne bruger?", -"Do you really want to delete group" => "Vil du virkelig slette denne gruppe?" -); diff --git a/admin/l10n/de.php b/admin/l10n/de.php deleted file mode 100644 index a1a0ec099e7..00000000000 --- a/admin/l10n/de.php +++ /dev/null @@ -1,20 +0,0 @@ -<?php $TRANSLATIONS = array( -"read more" => "mehr …", -"INSTALL" => "Installieren", -"Apps Repository" => "Anwendungen", -"Cannot connect to apps repository" => "Verbindung fehlgeschlagen", -"Name" => "Name", -"Modified" => "Änderungsdatum", -"Administration" => "Verwaltung", -"System Settings" => "Systemeinstellungen", -"Users" => "Nutzer", -"Groups" => "Gruppen", -"Password" => "Passwort", -"Create" => "Erstellen", -"remove" => "entfernen", -"Create group" => "Gruppe erstellen", -"Force new password:" => "Neues Passwort:", -"Set" => "OK", -"Do you really want to delete user" => "Möchtest du den Nutzer wirklich entfernen?", -"Do you really want to delete group" => "Möchtest du die Gruppe wirklich entfernen?" -); diff --git a/admin/l10n/es.php b/admin/l10n/es.php deleted file mode 100644 index 5902eb2c242..00000000000 --- a/admin/l10n/es.php +++ /dev/null @@ -1,20 +0,0 @@ -<?php $TRANSLATIONS = array( -"read more" => "leer más", -"INSTALL" => "Instalar", -"Apps Repository" => "Repositorio de aplicaciones ", -"Cannot connect to apps repository" => "No se pudo conectar con el repositorio de aplicaciones", -"Name" => "Nombre", -"Modified" => "Modificado", -"Administration" => "Administración", -"System Settings" => "Ajustes del Sistema", -"Users" => "Usuarios", -"Groups" => "Grupos", -"Password" => "Contraseña", -"Create" => "Crear", -"remove" => "Eliminar", -"Create group" => "Crear grupo", -"Force new password:" => "Forzar una nueva contraseña", -"Set" => "Aplicar", -"Do you really want to delete user" => "¿Seguro que quieres eliminar este usuario?", -"Do you really want to delete group" => "¿Seguro que quieres eliminar este grupo?" -); diff --git a/admin/l10n/fr.php b/admin/l10n/fr.php deleted file mode 100644 index e8d41a4be72..00000000000 --- a/admin/l10n/fr.php +++ /dev/null @@ -1,20 +0,0 @@ -<?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" -); diff --git a/admin/l10n/nl.php b/admin/l10n/nl.php deleted file mode 100644 index 138c95d2c98..00000000000 --- a/admin/l10n/nl.php +++ /dev/null @@ -1,19 +0,0 @@ -<?php $TRANSLATIONS = array( -"read more" => "Meer informatie", -"INSTALL" => "Installeer", -"Apps Repository" => "Applicatiedatabase", -"Cannot connect to apps repository" => "Kan geen verbinding maken met de applicatiedatabase", -"Name" => "Naam", -"Modified" => "Laatst aangepast", -"Administration" => "Administratie", -"System Settings" => "Systeeminstellingen", -"Users" => "Gebruikers", -"Groups" => "Groepen", -"Password" => "Wachtwoord", -"remove" => "verwijder", -"Create group" => "Groep aanmaken", -"Force new password:" => "Forceer nieuw wachtwoord:", -"Set" => "Ok", -"Do you really want to delete user" => "Wilt u deze gebruiker verwijderen", -"Do you really want to delete group" => "Wilt u deze groep verwijderen" -); diff --git a/admin/l10n/pl.php b/admin/l10n/pl.php deleted file mode 100644 index 169bb37b109..00000000000 --- a/admin/l10n/pl.php +++ /dev/null @@ -1,19 +0,0 @@ -<?php $TRANSLATIONS = array( -"read more" => "czytaj więcej", -"INSTALL" => "INSTALUJ", -"Apps Repository" => "Repozytorium aplikacji", -"Cannot connect to apps repository" => "Nie można połączyć się z repozytorium aplikacji", -"Name" => "Nazwa", -"Modified" => "Zmodyfikowano", -"Administration" => "Administracja", -"System Settings" => "Ustawienia systemowe", -"Users" => "Użytkownicy", -"Groups" => "Grupy", -"Password" => "Hasło", -"remove" => "usuń", -"Create group" => "Utwórz grupę", -"Force new password:" => "Wymuś nowe hasło", -"Set" => "Ustaw", -"Do you really want to delete user" => "Czy naprawdę chcesz usunąć użytkownika", -"Do you really want to delete group" => "Czy naprawdę chcesz usunąć grupę" -); diff --git a/admin/system.php b/admin/system.php deleted file mode 100644 index 42ae8a6c2d1..00000000000 --- a/admin/system.php +++ /dev/null @@ -1,36 +0,0 @@ -<?php - -/** -* ownCloud -* -* @author Frank Karlitschek -* @copyright 2010 Frank Karlitschek karlitschek@kde.org -* -* This library is free software; you can redistribute it and/or -* modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE -* License as published by the Free Software Foundation; either -* version 3 of the License, or any later version. -* -* This library is distributed in the hope that it will be useful, -* but WITHOUT ANY WARRANTY; without even the implied warranty of -* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -* GNU AFFERO GENERAL PUBLIC LICENSE for more details. -* -* You should have received a copy of the GNU Affero General Public -* License along with this library. If not, see <http://www.gnu.org/licenses/>. -* -*/ - -require_once('../lib/base.php'); -if( !OC_User::isLoggedIn() || !OC_Group::inGroup( OC_User::getUser(), 'admin' )){ - header( "Location: ".OC_Helper::linkTo( "", "index.php" )); - exit(); -} - -OC_App::setActiveNavigationEntry( "administration" ); - -$tmpl = new OC_Template( "admin", "system", "user" ); -$tmpl->printPage(); - -?> - diff --git a/admin/templates/system.php b/admin/templates/system.php deleted file mode 100644 index bbe4d2757a3..00000000000 --- a/admin/templates/system.php +++ /dev/null @@ -1,2 +0,0 @@ -<h2><?php echo $l->t( 'System Settings' ); ?></h2> -#TBD diff --git a/apps/contacts/appinfo/app.php b/apps/contacts/appinfo/app.php index 4fbbd9c638c..7ae6be5d6e3 100644 --- a/apps/contacts/appinfo/app.php +++ b/apps/contacts/appinfo/app.php @@ -14,5 +14,5 @@ OC_App::addNavigationEntry( array( 'id' => 'contacts_index', 'order' => 10, 'href' => OC_Helper::linkTo( 'contacts', 'index.php' ), - 'icon' => OC_Helper::imagePath( 'admin', 'users.svg' ), + 'icon' => OC_Helper::imagePath( 'settings', 'users.svg' ), 'name' => 'Contacts' )); diff --git a/help/appinfo/app.php b/help/appinfo/app.php deleted file mode 100644 index 372e28c97bd..00000000000 --- a/help/appinfo/app.php +++ /dev/null @@ -1,5 +0,0 @@ -<?php - -OC_App::register( array( "order" => 1, "id" => "help", "name" => "Help" )); - -?> diff --git a/help/css/help.css b/help/css/help.css deleted file mode 100644 index 2722c676a66..00000000000 --- a/help/css/help.css +++ /dev/null @@ -1,10 +0,0 @@ -/* APPS TABLE */ -table td.date { width:5em; padding:.5em 1em; text-align:right; } -.preview { padding:3px; text-align:left; } -table td.date { width:11em; color:#555555; } -table td.selection, table th.selection, table td.fileaction { width:2em; text-align:center; } -table td.name a { padding:6px; text-decoration:none; color:#555555; } -.type { text-decoration:none; color:#888888; font-size:.8em; } -.description { text-decoration:none; color:#666666; font-size:.9em; } - -table#help tr td { white-space:normal; } diff --git a/help/l10n/bg_BG.php b/help/l10n/bg_BG.php deleted file mode 100644 index 44f260693b3..00000000000 --- a/help/l10n/bg_BG.php +++ /dev/null @@ -1,4 +0,0 @@ -<?php $TRANSLATIONS = array( -"Questions and Answers" => "Въпроси и отговори", -"ASK A QUESTION" => "ЗАДАЙТЕ ВЪПРОС" -); diff --git a/help/l10n/da.php b/help/l10n/da.php deleted file mode 100644 index 2b8120c0c38..00000000000 --- a/help/l10n/da.php +++ /dev/null @@ -1,4 +0,0 @@ -<?php $TRANSLATIONS = array( -"Questions and Answers" => "Spørgsmål og Svar", -"ASK A QUESTION" => "STIL ET SPØRGSMÅL" -); diff --git a/help/l10n/de.php b/help/l10n/de.php deleted file mode 100644 index 07c5d1bb771..00000000000 --- a/help/l10n/de.php +++ /dev/null @@ -1,4 +0,0 @@ -<?php $TRANSLATIONS = array( -"Questions and Answers" => "Fragen & Antworten", -"ASK A QUESTION" => "Stell eine Frage" -); diff --git a/help/l10n/es.php b/help/l10n/es.php deleted file mode 100644 index e42c9db85de..00000000000 --- a/help/l10n/es.php +++ /dev/null @@ -1,4 +0,0 @@ -<?php $TRANSLATIONS = array( -"Questions and Answers" => "Preguntas y Respuestas", -"ASK A QUESTION" => "Haz una pregunta" -); diff --git a/help/l10n/fr.php b/help/l10n/fr.php deleted file mode 100644 index 2b9bf96684d..00000000000 --- a/help/l10n/fr.php +++ /dev/null @@ -1,4 +0,0 @@ -<?php $TRANSLATIONS = array( -"Questions and Answers" => "Questions / Réponses", -"ASK A QUESTION" => "Poser une question" -); diff --git a/help/l10n/nl.php b/help/l10n/nl.php deleted file mode 100644 index 11a28894c72..00000000000 --- a/help/l10n/nl.php +++ /dev/null @@ -1,4 +0,0 @@ -<?php $TRANSLATIONS = array( -"Questions and Answers" => "Vraag en Antwoord", -"ASK A QUESTION" => "Stel een vraag" -); diff --git a/help/l10n/pl.php b/help/l10n/pl.php deleted file mode 100644 index 7d37913d037..00000000000 --- a/help/l10n/pl.php +++ /dev/null @@ -1,4 +0,0 @@ -<?php $TRANSLATIONS = array( -"Questions and Answers" => "Pytania i odpowiedzi", -"ASK A QUESTION" => "ZADAJ PYTANIE" -); diff --git a/lib/app.php b/lib/app.php index e7cf74af85c..e9f97a4354e 100644 --- a/lib/app.php +++ b/lib/app.php @@ -52,7 +52,7 @@ class OC_App{ } // Our very own core apps are hardcoded - foreach( array( 'admin', 'files', 'help', 'settings' ) as $app ){ + foreach( array('files', 'settings') as $app ){ require( $app.'/appinfo/app.php' ); } @@ -200,13 +200,13 @@ class OC_App{ public static function getSettingsNavigation(){ $l=new OC_L10N('core'); $admin=array( - array( "id" => "core_users", "order" => 2, "href" => OC_Helper::linkTo( "admin", "users.php" ), "name" => $l->t("Users"), "icon" => OC_Helper::imagePath( "admin", "users.svg" )), - array( "id" => "core_apps", "order" => 3, "href" => OC_Helper::linkTo( "admin", "apps.php?installed" ), "name" => $l->t("Apps"), "icon" => OC_Helper::imagePath( "admin", "apps.svg" )), + array( "id" => "core_users", "order" => 2, "href" => OC_Helper::linkTo( "settings", "users.php" ), "name" => $l->t("Users"), "icon" => OC_Helper::imagePath( "settings", "users.svg" )), + array( "id" => "core_apps", "order" => 3, "href" => OC_Helper::linkTo( "settings", "apps.php?installed" ), "name" => $l->t("Apps"), "icon" => OC_Helper::imagePath( "settings", "apps.svg" )), // array( "id" => "files_administration", "order" => 3, "href" => OC_Helper::linkTo( "files", "admin.php" ), "name" => $l->t("Files"), "icon" => OC_Helper::imagePath( "settings", "options.svg" )), ); $settings=array( - array( "id" => "help", "order" => 1000, "href" => OC_Helper::linkTo( "help", "index.php" ), "name" => $l->t("Help"), "icon" => OC_Helper::imagePath( "help", "help.svg" )), - array( "id" => "settings", "order" => 1, "href" => OC_Helper::linkTo( "settings", "index.php" ), "name" => $l->t("Personal"), "icon" => OC_Helper::imagePath( "settings", "personal.svg" )) + array( "id" => "help", "order" => 1000, "href" => OC_Helper::linkTo( "settings", "help.php" ), "name" => $l->t("Help"), "icon" => OC_Helper::imagePath( "settings", "help.svg" )), + array( "id" => "settings", "order" => 1, "href" => OC_Helper::linkTo( "settings", "personal.php" ), "name" => $l->t("Personal"), "icon" => OC_Helper::imagePath( "settings", "personal.svg" )) ); if( OC_Group::inGroup( $_SESSION["user_id"], "admin" )){ $settings=array_merge($admin,$settings); diff --git a/settings/ajax/changepassword.php b/settings/ajax/changepassword.php index b9b2417ad9a..98c2a8b37a1 100644 --- a/settings/ajax/changepassword.php +++ b/settings/ajax/changepassword.php @@ -3,35 +3,24 @@ // Init owncloud require_once('../../lib/base.php'); -$l=new OC_L10N('settings'); - // We send json data -header("Content-Type: application/jsonrequest"); +header( "Content-Type: application/jsonrequest" ); // Check if we are a user -if(!OC_User::isLoggedIn()){ - echo json_encode(array("status" => "error", "data" => array("message" => $l->t("Authentication error")))); +if( !OC_User::isLoggedIn() || !OC_Group::inGroup( OC_User::getUser(), 'admin' )){ + echo json_encode( array( "status" => "error", "data" => array( "message" => "Authentication error" ))); exit(); } -// Get data -if(!isset($_POST["password"]) && !isset($_POST["oldpassword"])){ - echo json_encode(array("status" => "error", "data" => array("message" => $l->t("You have to enter the old and the new password!")))); - exit(); -} +$username = $_POST["username"]; +$password = $_POST["password"]; -// Check if the old password is correct -if(!OC_User::checkPassword($_SESSION["user_id"], $_POST["oldpassword"])){ - echo json_encode(array("status" => "error", "data" => array("message" => $l->t("Your old password is wrong!")))); - exit(); +// Return Success story +if( OC_User::setPassword( $username, $password )){ + echo json_encode( array( "status" => "success", "data" => array( "username" => $username ))); } - -// Change password -if(OC_User::setPassword($_SESSION["user_id"], $_POST["password"])){ - echo json_encode(array("status" => "success", "data" => array("message" => $l->t("Password changed")))); - OC_Crypt::changekeypasscode($_POST["password"]); -}else{ - echo json_encode(array("status" => "error", "data" => array("message" => $l->t("Unable to change password")))); +else{ + echo json_encode( array( "status" => "error", "data" => array( "message" => "Unable to change password" ))); } ?> diff --git a/admin/ajax/creategroup.php b/settings/ajax/creategroup.php index 2631937b14d..2631937b14d 100644 --- a/admin/ajax/creategroup.php +++ b/settings/ajax/creategroup.php diff --git a/admin/ajax/createuser.php b/settings/ajax/createuser.php index de52f90d4f3..de52f90d4f3 100644 --- a/admin/ajax/createuser.php +++ b/settings/ajax/createuser.php diff --git a/admin/ajax/disableapp.php b/settings/ajax/disableapp.php index 0cf66a553f8..0cf66a553f8 100644 --- a/admin/ajax/disableapp.php +++ b/settings/ajax/disableapp.php diff --git a/admin/ajax/enableapp.php b/settings/ajax/enableapp.php index eb1bfc54a04..eb1bfc54a04 100644 --- a/admin/ajax/enableapp.php +++ b/settings/ajax/enableapp.php diff --git a/admin/ajax/removegroup.php b/settings/ajax/removegroup.php index bf80da741c7..bf80da741c7 100644 --- a/admin/ajax/removegroup.php +++ b/settings/ajax/removegroup.php diff --git a/admin/ajax/removeuser.php b/settings/ajax/removeuser.php index 0a94884cb96..0a94884cb96 100644 --- a/admin/ajax/removeuser.php +++ b/settings/ajax/removeuser.php diff --git a/admin/ajax/togglegroups.php b/settings/ajax/togglegroups.php index 3210252af02..3210252af02 100644 --- a/admin/ajax/togglegroups.php +++ b/settings/ajax/togglegroups.php diff --git a/settings/appinfo/app.php b/settings/appinfo/app.php index 4ffb944aba3..d18bcdbff0d 100644 --- a/settings/appinfo/app.php +++ b/settings/appinfo/app.php @@ -1,5 +1,7 @@ <?php OC_App::register( array( "id" => "settings", "name" => "Settings" )); +OC_App::register( array( "order" => 1, "id" => "admin", "name" => "Administration" )); +OC_App::register( array( "order" => 1, "id" => "help", "name" => "Help" )); ?> diff --git a/admin/apps.php b/settings/apps.php index c74f9032916..e41a0cbf8dd 100644 --- a/admin/apps.php +++ b/settings/apps.php @@ -28,8 +28,9 @@ if( !OC_User::isLoggedIn() || !OC_Group::inGroup( OC_User::getUser(), 'admin' )) } // Load the files we need -OC_Util::addStyle( "admin", "apps" ); -OC_Util::addScript( "admin", "apps" ); +OC_Util::addStyle( "settings", "settings" ); +OC_Util::addScript( "settings", "apps" ); +OC_App::setActiveNavigationEntry( "core_apps" ); $registeredApps=OC_App::getAllApps(); $apps=array(); @@ -59,7 +60,7 @@ foreach($externalApps as $app){ -$tmpl = new OC_Template( "admin", "apps", "user" ); +$tmpl = new OC_Template( "settings", "apps", "user" ); $tmpl->assign('apps',$apps); $tmpl->printPage(); diff --git a/settings/css/settings.css b/settings/css/settings.css index 66299b1faa0..7499de1e053 100644 --- a/settings/css/settings.css +++ b/settings/css/settings.css @@ -1,4 +1,30 @@ +/* PERSONAL */ #passworderror { display:none; } #passwordchanged { display:none; } - input#identity { width:20em; } + + +/* USERS */ +form { display:inline; } +td.name, td.password { padding-left:.8em; } +td.password>img, td.remove>img { display:none; cursor:pointer; } +td.password>span { margin-right:1.2em; } +td.password { width:12em; cursor:pointer; } + +td.remove { width:1em; } +tr:hover>td.password>span { margin:0; cursor:pointer; } +tr:hover>td.remove>img, tr:hover>td.password>img { display:inline; cursor:pointer; } +tr:hover>td.remove>img { float:right; } +li.selected { background-color:#ddd; } +#content>table { margin-top:6.5em; } +table { width:100%; } + + +/* APPS */ +li{color:#888} +li.active{color:#000} +span.version{margin-left:3em;color:#ddd} + + +/* HELP */ +table#help tr td { white-space:normal; } diff --git a/help/index.php b/settings/help.php index 7eb0c6b1820..b6466d282bf 100644 --- a/help/index.php +++ b/settings/help.php @@ -12,13 +12,13 @@ $page=2; // Load the files we need -OC_Util::addStyle( "help", "help" ); +OC_Util::addStyle( "settings", "settings" ); OC_App::setActiveNavigationEntry( "help" ); $kbe=OC_OCSClient::getKnownledgebaseEntries(); -$tmpl = new OC_Template( "help", "index", "user" ); +$tmpl = new OC_Template( "settings", "help", "user" ); $tmpl->assign( "kbe", $kbe ); $tmpl->assign( "pagecount", $pagecount ); $tmpl->assign( "page", $page ); diff --git a/admin/img/apps.png b/settings/img/apps.png Binary files differindex 17f47d632b9..17f47d632b9 100644 --- a/admin/img/apps.png +++ b/settings/img/apps.png diff --git a/admin/img/apps.svg b/settings/img/apps.svg index cda246bc4a8..cda246bc4a8 100644 --- a/admin/img/apps.svg +++ b/settings/img/apps.svg diff --git a/help/img/help.png b/settings/img/help.png Binary files differindex 2257d144d11..2257d144d11 100644 --- a/help/img/help.png +++ b/settings/img/help.png diff --git a/help/img/help.svg b/settings/img/help.svg index 1e07aed8527..1e07aed8527 100644 --- a/help/img/help.svg +++ b/settings/img/help.svg diff --git a/admin/img/users.png b/settings/img/users.png Binary files differindex f56e2442c9e..f56e2442c9e 100644 --- a/admin/img/users.png +++ b/settings/img/users.png diff --git a/admin/img/users.svg b/settings/img/users.svg index 1c8c8955693..1c8c8955693 100644 --- a/admin/img/users.svg +++ b/settings/img/users.svg diff --git a/admin/js/apps.js b/settings/js/apps.js index 069681e1cd1..069681e1cd1 100644 --- a/admin/js/apps.js +++ b/settings/js/apps.js diff --git a/settings/js/main.js b/settings/js/personal.js index f6b7eeb7584..f6b7eeb7584 100644 --- a/settings/js/main.js +++ b/settings/js/personal.js diff --git a/admin/js/users.js b/settings/js/users.js index addf1c2d65f..addf1c2d65f 100644 --- a/admin/js/users.js +++ b/settings/js/users.js diff --git a/settings/index.php b/settings/personal.php index aea35054930..d2c29019ca5 100644 --- a/settings/index.php +++ b/settings/personal.php @@ -7,9 +7,9 @@ if( !OC_User::isLoggedIn()){ } // Highlight navigation entry -OC_App::setActiveNavigationEntry( "settings" ); -OC_Util::addScript( "settings", "main" ); +OC_Util::addScript( "settings", "personal" ); OC_Util::addStyle( "settings", "settings" ); +OC_App::setActiveNavigationEntry( "settings" ); // calculate the disc space $used=OC_Filesystem::filesize('/'); @@ -24,7 +24,7 @@ unset($languages[array_search($lang,$languages)]); array_unshift($languages,$lang); // Return template -$tmpl = new OC_Template( "settings", "index", "user"); +$tmpl = new OC_Template( "settings", "personal", "user"); $tmpl->assign('usage',OC_Helper::humanFileSize($used)); $tmpl->assign('total_space',OC_Helper::humanFileSize($total)); $tmpl->assign('usage_relative',$relative); diff --git a/admin/templates/apps.php b/settings/templates/apps.php index 025fbc4c81f..025fbc4c81f 100644 --- a/admin/templates/apps.php +++ b/settings/templates/apps.php diff --git a/help/templates/index.php b/settings/templates/help.php index ef5510e78b4..4cd748c3dff 100644 --- a/help/templates/index.php +++ b/settings/templates/help.php @@ -14,7 +14,7 @@ </tbody> </table> <?php - $url=OC_Helper::linkTo( "help", "index.php" ).'?page='; + $url=OC_Helper::linkTo( "settings", "help.php" ).'?page='; $pageNavi=OC_Util::getPageNavi($_['pagecount'],$_['page'],$url); $pageNavi->printPage(); ?> diff --git a/settings/templates/index.php b/settings/templates/personal.php index 48c3f542018..48c3f542018 100644 --- a/settings/templates/index.php +++ b/settings/templates/personal.php diff --git a/admin/templates/users.php b/settings/templates/users.php index 77a4f0c0d57..0009c85fa38 100644 --- a/admin/templates/users.php +++ b/settings/templates/users.php @@ -22,7 +22,7 @@ foreach($_["groups"] as $group) { <td class="name"><?php echo $user["name"]; ?></td> <td class="password"> <span>●●●●●●●</span> - <img class="svg" src="<?php echo image_path('core','actions/rename.svg')?>"/> + <img class="svg" src="<?php echo image_path('core','actions/rename')?>"/> </td> <td class="groups"> <select data-username="<?php echo $user['name'] ;?>" data-user-groups="<?php echo $user['groups'] ;?>" data-placeholder="groups" title="<?php echo $l->t('Groups')?>" multiple="multiple"> @@ -33,7 +33,7 @@ foreach($_["groups"] as $group) { </td> <td class="remove"> <?php if($user['name']!=OC_User::getUser()):?> - <img alt="Remove" title="<?php echo $l->t('Remove')?>" class='svg' src='<?php echo image_path('core','actions/delete.svg') ?>'/> + <img alt="Remove" title="<?php echo $l->t('Remove')?>" class="svg" src="<?php echo image_path('core','actions/delete') ?>" /> <?php endif;?> </td> </tr> diff --git a/admin/users.php b/settings/users.php index cbec28a544b..cd7d04a55e7 100644 --- a/admin/users.php +++ b/settings/users.php @@ -28,8 +28,8 @@ if( !OC_User::isLoggedIn() || !OC_Group::inGroup( OC_User::getUser(), 'admin' )) } // We have some javascript foo! -OC_Util::addScript( 'admin', 'users' ); -OC_Util::addStyle( 'admin', 'users' ); +OC_Util::addScript( 'settings', 'users' ); +OC_Util::addStyle( 'settings', 'settings' ); OC_Util::addScript( '3rdparty', 'chosen/chosen.jquery.min' ); OC_Util::addStyle( '3rdparty', 'chosen' ); OC_App::setActiveNavigationEntry( 'core_users' ); @@ -46,7 +46,7 @@ foreach( OC_Group::getGroups() as $i ){ $groups[] = array( "name" => $i ); } -$tmpl = new OC_Template( "admin", "users", "user" ); +$tmpl = new OC_Template( "settings", "users", "user" ); $tmpl->assign( "users", $users ); $tmpl->assign( "groups", $groups ); $tmpl->printPage(); |