Merge branch 'refactoring' of git://anongit.kde.org/owncloud into refactoring
remotes/origin/stable
Jakob Sack
15 years ago
-
2admin/templates/app.php
-
43css/styles.css
-
37files/ajax/list.php
-
29files/ajax/newfolder.php
-
4files/css/files.css
-
11files/index.php
-
86files/js/files.js
-
22files/templates/index.php
-
4files/templates/part.breadcrumb.php
-
9files/templates/part.list.php
-
2help/appinfo/app.php
-
6help/css/help.css
-
17help/templates/index.php
-
BINimg/header-a.png
-
0img/header-login.png
-
BINimg/header-settings-a.png
-
BINimg/header-settings.png
-
0img/header.png
-
19js/js.js
-
5lib/filestorage.php
-
6lib/filesystem.php
-
2lib/installer.php
-
22lib/ocsclient.php
-
7log/templates/index.php
-
2settings/index.php
-
40templates/installation.php
-
3templates/layout.admin.php
-
2templates/layout.guest.php
-
2templates/layout.user.php
-
6templates/login.php
@ -0,0 +1,29 @@ |
|||
<?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()){ |
|||
echo json_encode( array( "status" => "error", "data" => array( "message" => "Authentication error" ))); |
|||
exit(); |
|||
} |
|||
|
|||
// Get the params
|
|||
$dir = isset( $_GET['dir'] ) ? $_GET['dir'] : ''; |
|||
$foldername = isset( $_GET['foldername'] ) ? $_GET['foldername'] : ''; |
|||
|
|||
if($foldername == '') { |
|||
echo json_encode( array( "status" => "error", "data" => array( "message" => "Empty Foldername" ))); |
|||
exit(); |
|||
} |
|||
error_log('try to create ' . $foldername . ' in ' . $dir); |
|||
if(OC_FILES::newFile($dir, $foldername, 'dir')) { |
|||
echo json_encode( array( "status" => "success", "data" => array())); |
|||
exit(); |
|||
} |
|||
|
|||
echo json_encode( array( "status" => "error", "data" => array( "message" => "Error when creating the folder" ))); |
|||
@ -0,0 +1,4 @@ |
|||
<a href="<?php echo link_to("files", "index.php?dir=/"); ?>"><img src="<?php echo image_path("", "actions/go-home.png"); ?>" alt="Root" /></a> |
|||
<?php foreach($_["breadcrumb"] as $crumb): ?>
|
|||
<a href="<?php echo link_to("files", "index.php?dir=".$crumb["dir"]); ?>"><?php echo $crumb["name"]; ?></a>
|
|||
<?php endforeach; ?>
|
|||
@ -0,0 +1,9 @@ |
|||
<?php foreach($_["files"] as $file): ?>
|
|||
<tr> |
|||
<td class="selection"><input type="checkbox" /></td> |
|||
<td class="filename"><a style="background-image:url(<?php if($file["type"] == "dir") echo mimetype_icon("dir"); else echo mimetype_icon($file["mime"]); ?>)" href="<?php if($file["type"] == "dir") echo link_to("files", "index.php?dir=".$file["directory"]."/".$file["name"]); else echo link_to("files", "download.php?file=".$file["directory"]."/".$file["name"]); ?>" title=""><?php echo $file["name"]; ?></a></td>
|
|||
<td class="filesize"><?php echo human_file_size($file["size"]); ?></td>
|
|||
<td class="date"><?php if($file["type"] != "dir") echo $file["date"]; ?></td>
|
|||
<td class="fileaction"><a href="" title=""><img src="images/drop-arrow.png" alt="+" /></a></td> |
|||
</tr> |
|||
<?php endforeach; ?>
|
|||
@ -1,6 +1,6 @@ |
|||
<?php |
|||
|
|||
OC_APP::register( array( "order" => 1, "id" => "help", "name" => "Help" )); |
|||
OC_APP::addSettingsPage( array( "order" => 2, "href" => OC_HELPER::linkTo( "help", "index.php" ), "name" => "Help", "icon" => OC_HELPER::imagePath( "admin", "navicon.png" ))); |
|||
OC_APP::addSettingsPage( array( "order" => 2, "href" => OC_HELPER::linkTo( "help", "index.php" ), "name" => "Help", "icon" => OC_HELPER::imagePath( "settings", "information.png" ))); |
|||
|
|||
?>
|
|||
@ -1,17 +1,18 @@ |
|||
<?php |
|||
/* |
|||
* Template for settings page |
|||
*/ |
|||
?>
|
|||
<h1>Help</h1> |
|||
|
|||
<h1>Questions and Answers</h1> |
|||
|
|||
<table cellspacing="0"> |
|||
<tbody> |
|||
<?php foreach($_["kbe"] as $kb): ?>
|
|||
<tr> |
|||
<td width="1"><?php if($kb["preview1"] <> "") { echo('<a href="'.OC_HELPER::linkTo( "help", "index.php" ).'?id='.$kb['id'].'"><img class="preview" border="0" src="'.$kb["preview1"].'" /></a>'); } ?> </a></td>
|
|||
<td class="name"><a href="<?php echo(OC_HELPER::linkTo( "help", "index.php" ).'?id='.$kb['id']); ?>" title=""><?php echo $kb["name"]; ?></a><br /><?php echo('<span class="type">'.$kb['description'].'</span>'); ?></td>
|
|||
<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 />
|
|||
<?php if($kb['answer']<>'') echo('<br /><span class="type"><b>Answer:</b></span><br /><span class="type">'.$kb['answer'].'</span>');?>
|
|||
</td> |
|||
</tr> |
|||
<?php endforeach; ?>
|
|||
</tbody> |
|||
</table> |
|||
<span class="button"><a target="_blank" href="http://apps.owncloud.com/knowledgebase/editquestion.php?action=new">ASK A QUESTION</a></span> |
|||
|
|||
|
|||
|
After Width: 16 | Height: 75 | Size: 2.9 KiB |
|
Before Width: 16 | Height: 180 | Size: 2.3 KiB After Width: 16 | Height: 180 | Size: 2.3 KiB |
|
After Width: 16 | Height: 75 | Size: 2.8 KiB |
|
After Width: 16 | Height: 75 | Size: 2.8 KiB |
|
Before Width: 16 | Height: 75 | Size: 2.9 KiB After Width: 16 | Height: 75 | Size: 2.9 KiB |