adjusted backend, deactivated Apps subentry

11 files changed, 30 insertions, 144 deletions

diff --git a/admin/appinfo/app.php b/admin/appinfo/app.php
index dfb9aee8159..08a36060fe3 100644
--- a/admin/appinfo/app.php
+++ b/admin/appinfo/app.php
@@ -7,6 +7,6 @@ OC_App::addAdminPage( array( "id" => "core_users", "order" => 2, "href" => OC_He
 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" )));
 
 ?>
diff --git a/admin/css/apps.css b/admin/css/apps.css
index cd427a3c536..fa4dfe9f614 100644
--- a/admin/css/apps.css
+++ b/admin/css/apps.css
@@ -1,68 +1,10 @@
 /* APPS TABLE */
-
-table td.date
-{
-    width: 5em;
-    padding: 0.5em 1em;
-    text-align: right;
-}
-
-table td.version, table td.enabled, table td.disabled
-{
-    padding: 0.5em 1em;
-    text-align: center;
-}
-
-input[type="button"].enabled
-{
-    color: #006600;
-}
-
-input[type="button"].disabled
-{
-    color: #660000;
-}
-
-.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: 0.8em;
-}
-
-.description 
-{
-    text-decoration: none;
-    color: #666666;
-    font-size: 0.9em;
-}
-
-
-input[type="button"].appbutton { padding:0.1em 1em; border:1px solid #999; font-weight:bold; font-size:0.9em; cursor:pointer; }
-input[type="button"]:hover.appbutton, form input[type="submit"]:focus { border:1px solid #999; background-color:#999; outline:0; }
-input[type="button"]:active.appbutton { outline:0; }
\ No newline at end of file
+table td.date { width:5em; padding:.5em 1em; text-align:right; }
+table td.version, table td.enabled, table td.disabled { padding:.5em 1em; text-align:center; }
+.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; }
+input[type="submit"].enabled { background:#aea; -moz-box-shadow:0 1px 1px #f8f8f8, 0 1px 1px #cfc inset; -webkit-box-shadow:0 1px 1px #f8f8f8, 0 1px 1px #cfc inset; box-shadow:0 1px 1px #f8f8f8, 0 1px 1px #cfc inset; }
diff --git a/admin/css/users.css b/admin/css/users.css
deleted file mode 100644
index 7f441499bd1..00000000000
--- a/admin/css/users.css
+++ /dev/null
@@ -1,3 +0,0 @@
-#usertable, #grouptable{
-	margin:0px;
-}
\ No newline at end of file
diff --git a/admin/templates/app_noconn.php b/admin/templates/app_noconn.php
index 70b7d9b3119..f22d3656287 100644
--- a/admin/templates/app_noconn.php
+++ b/admin/templates/app_noconn.php
@@ -1,7 +1 @@
-<?php
-/*
- * Template for Apps when can't connect to app store
- */
-?>
-<h1><?php echo $l->t( 'Apps Repository' ); ?></h1>
 <h2><?php echo $l->t( 'Cannot connect to apps repository' ); ?></h2>
diff --git a/admin/templates/appsinst.php b/admin/templates/appsinst.php
index d1adb5f45a1..d205d95cc34 100644
--- a/admin/templates/appsinst.php
+++ b/admin/templates/appsinst.php
@@ -13,7 +13,7 @@
 				<td class="name" width="200"><?php echo($app['name']); ?></td>
 				<td class="version"><?php echo($app['version']); ?></td>
 				<td><?php echo($app['author']); ?></td>
-				<td><input x-use="appenablebutton" type="button" value="<?php echo $l->t( $app['enabled'] ? 'enabled' : 'disabled' ); ?>" class="appbutton prettybutton <?php echo( $app['enabled'] ? 'enabled' : 'disabled' ); ?>" /></td>
+				<td><input x-use="appenablebutton" type="submit" value="<?php echo $l->t( $app['enabled'] ? 'enabled' : 'disabled' ); ?>" class="appbutton <?php echo( $app['enabled'] ? 'enabled' : 'disabled' ); ?>" /></td>
 			</tr>
 		<?php endforeach; ?>
 	</tbody>
diff --git a/admin/templates/system.php b/admin/templates/system.php
index 92ff9c836a8..bbe4d2757a3 100644
--- a/admin/templates/system.php
+++ b/admin/templates/system.php
@@ -1,8 +1,2 @@
-<?php
-/*
- * Template for admin pages
- */
-?>
-<h1><?php echo $l->t( 'Administration' ); ?></h1>
 <h2><?php echo $l->t( 'System Settings' ); ?></h2>
-#TBD
\ No newline at end of file
+#TBD
diff --git a/admin/templates/users.php b/admin/templates/users.php
index 6fc3e643010..79a4c712049 100644
--- a/admin/templates/users.php
+++ b/admin/templates/users.php
@@ -12,8 +12,8 @@
 			<tr id="createuserform">
 				<form id="createuserdata">
 					<td>
-						<input x-use="createuserfield" type="text" name="username" placeholder='<?php echo $l->t( 'Name' ); ?>' />
-						<input x-use="createuserfield" type="password" name="password" placeholder='<?php echo $l->t( 'Password' ); ?>' />
+						<input x-use="createuserfield" type="text" name="username" placeholder="<?php echo $l->t( 'Name' ); ?>" />
+						<input x-use="createuserfield" type="password" name="password" placeholder="<?php echo $l->t( 'Password' ); ?>" />
 					</td>
 					<td id="createusergroups">
 						<?php foreach($_["groups"] as $i): ?>
@@ -22,7 +22,7 @@
 						<?php endforeach; ?>
 					</td>
 					<td>
-						<button id="createuserbutton"><?php echo $l->t( 'Create' ); ?></button>
+						<input type="submit" id="createuserbutton" value="<?php echo $l->t( 'Add user' ); ?>" />
 					</td>
 				</form>
 			</tr>
@@ -34,7 +34,7 @@
 					<td x-use="usergroups"><div x-use="usergroupsdiv"><?php if( $user["groups"] ){ echo $user["groups"]; }else{echo "&nbsp";} ?></div></td>
 					<td>
 						<?php if($user['name']!=OC_User::getUser()):?>
-							<a  class="removeuserbutton" href=""><?php echo $l->t( 'remove' ); ?></a>
+							<input type="submit" class="removeuserbutton" value="<?php echo $l->t( 'Remove' ); ?>" />
 						<?php endif;?>
 					</td>
 				</tr>
@@ -55,8 +55,8 @@
 		<tfoot>
 			<form id="creategroupdata">
 				<tr>
-					<td><input x-use="creategroupfield" type="text" name="groupname" /></td>
-					<td><button id="creategroupbutton"><?php echo $l->t( 'Create group' ); ?></button></td>
+					<td><input x-use="creategroupfield" type="text" name="groupname" placeholder="New group" /></td>
+					<td><input type="submit" id="creategroupbutton" value="<?php echo $l->t( 'Create group' ); ?>" /></td>
 				</tr>
 			</form>
 		</tfoot>
@@ -66,7 +66,7 @@
 					<td><?php echo $group["name"] ?></td>
 					<td>
 						<?php if( $group["name"] != "admin" ): ?>
-							<a class="removegroupbutton" href=""><?php echo $l->t( 'remove' ); ?></a>
+							<input type="submit" class="removegroupbutton" value="<?php echo $l->t( 'remove' ); ?>" />
 						<?php else: ?>
 							&nbsp;
 						<?php endif; ?>
@@ -94,7 +94,7 @@
 		<input id="changepassworduid" type="hidden" name="username" value="" />
 		<?php echo $l->t( 'Force new password:' ); ?>
 		<input id="changepasswordpwd" type="password" name="password" value="" />
-		<button id="changepasswordbutton"><?php echo $l->t( 'Set' ); ?></button>
+		<input type="submit" id="changepasswordbutton" value="<?php echo $l->t( 'Set' ); ?>" />
 	</form>
 </span>
 
diff --git a/admin/users.php b/admin/users.php
index fd0b6fec01b..b87f1bb5bc8 100644
--- a/admin/users.php
+++ b/admin/users.php
@@ -29,7 +29,6 @@ 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_App::setActiveNavigationEntry( "core_users" );
 
 $users = array();
diff --git a/core/css/styles.css b/core/css/styles.css
index 3ab26ea143f..fdf49265a3f 100644
--- a/core/css/styles.css
+++ b/core/css/styles.css
@@ -15,14 +15,14 @@ input, select { font-size:1em; width:10em; margin:.3em; padding:.5em; background
 input[type="text"], input[type="password"] { background:#f8f8f8; color:#555; cursor:text; }
 input[type="text"]:hover, input[type="text"]:focus, input[type="password"]:hover, input[type="password"]:focus { background:#fff; color:#333; }
 
-input[type="submit"] { width:auto; padding:.4em; border:1px solid #ddd; font-weight:bold; cursor:pointer; background-color:#f8f8f8; color:#555; -moz-box-shadow:0 1px 1px #f8f8f8, 0 1px 1px #fff inset; -webkit-box-shadow:0 1px 1px #f8f8f8, 0 1px 1px #fff inset; -moz-border-radius:.5em; -webkit-border-radius:.5em; border-radius:.5em; }
+input[type="submit"] { width:auto; padding:.4em; border:1px solid #ddd; font-weight:bold; cursor:pointer; background:#f8f8f8; color:#555; -moz-box-shadow:0 1px 1px #fff, 0 1px 1px #fff inset; -webkit-box-shadow:0 1px 1px #fff, 0 1px 1px #fff inset; -moz-border-radius:.5em; -webkit-border-radius:.5em; border-radius:.5em; }
 input[type="submit"]:hover, input[type="submit"]:focus { background:#fff; color:#333; }
 input[type="checkbox"] { width:auto; }
 
 #body-login input { font-size:1.5em; }
 #body-login input[type="submit"] { float:right; margin-right:.8em; }
 #remember_login { margin:.8em .2em 0 1em; }
-form.searchbox input[type="search"] { position:fixed; font-size:1.2em; top:.3em; right:7em;  padding:.3em 1.6em .3em; background:#eee url('../img/actions/search.png') .5em center no-repeat; -moz-border-radius:1em; -webkit-border-radius:1em; border-radius:1em; }
+form.searchbox input[type="search"] { position:fixed; font-size:1.2em; top:.3em; right:7em;  padding:.3em 1.6em .3em; background:#f8f8f8 url('../img/actions/search.png') .5em center no-repeat; -moz-border-radius:1em; -webkit-border-radius:1em; border-radius:1em; }
 
 form#user_settings { max-width:600px; }
 form#user_settings p label { display:block; float:left; width:35%; padding:0.4em 0.5em 0 0; text-align:right; }
diff --git a/help/css/help.css b/help/css/help.css
index e46cf112092..e8c42f808d1 100644
--- a/help/css/help.css
+++ b/help/css/help.css
@@ -1,48 +1,8 @@
 /* APPS TABLE */
-
-table td.date
-{
-    width: 5em;
-    padding: 0.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: 0.8em;
-}
-
-.description 
-{
-    text-decoration: none;
-    color: #666666;
-    font-size: 0.9em;
-}
-
+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; }
diff --git a/help/templates/index.php b/help/templates/index.php
index 82ab224d49e..f859a8ae70c 100644
--- a/help/templates/index.php
+++ b/help/templates/index.php
@@ -6,7 +6,7 @@
 			<?php foreach($_["kbe"] as $kb): ?>
 				<tr>
 					<td width="1"><?php if($kb["preview1"] <> "") { echo('<img class="preview" border="0" src="'.$kb["preview1"].'" />'); } ?> </a></td>
-					<td class="name"><?php echo $kb["name"]; ?><br /><?php  echo('<span class="type">'.$kb['description'].'</span>'); ?><br />
+					<td class="name"><?php echo $kb["name"]; ?><br /><?php  echo('<span class="type">'.$kb['description'].'</span>'); ?>
 					<?php if($kb['answer']<>'') echo('<br /><span class="type"><b>Answer:</b></span><br /><span class="type">'.$kb['answer'].'</span>');?>
 					</td>
 				</tr>