open-dsi
/
nextcloud-server
mirror of https://github.com/nextcloud/server
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge branch 'refactoring' of git://anongit.kde.org/owncloud into refactoring

Browse Source
remotes/origin/stable
Jan-Christoph Borchardt 14 years ago
parent 8dcfd0ee8a 9b26cb0bfb
commit 799a1b9539
8 changed files with 105 additions and 20 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 2
      admin/templates/app.php
  2. 29
      files/ajax/newfolder.php
  3. 4
      files/css/files.css
  4. 60
      files/js/files.js
  5. 7
      files/templates/index.php
  6. 6
      help/css/help.css
  7. 12
      help/templates/index.php
  8. 3
      lib/ocsclient.php

2
admin/templates/app.php
Unescape View File

@ -19,7 +19,7 @@ $app=$_['app'];
<td class="description" valign="top">
<?php echo $app["description"]; ?>
<br />
<?php echo('<a class="description" href="'.$app["detailpage"].'">read more</a><br />'); ?>
<?php echo('<a class="description" target="_blank" href="'.$app["detailpage"].'">read more</a><br />'); ?>
</td>
<td width="1" valign="top" class="install"><a href="">INSTALL</a></td>
</tr>

29
files/ajax/newfolder.php
Unescape View File

@ -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" )));

4
files/css/files.css
Unescape View File

@ -23,11 +23,11 @@
display: none;
}
#file_upload_target {
#file_newfolder_form {
display: none;
}
#file_action_panel {
#file_upload_target {
display: none;
}

60
files/js/files.js
Unescape View File

@ -1,4 +1,6 @@
$(document).ready(function() {
$('#file_action_panel').attr('activeAction', false);
// Sets browser table behaviour :
$('.browser tr').hover(
function() {
@ -37,15 +39,42 @@ $(document).ready(function() {
$('.browser input:checkbox').attr('checked', false);
});
// Shows and hides file upload form
$('#file_upload_button').toggle(function() {
$('#file_upload_start').click(function() {
$('#file_upload_target').load(uploadFinished);
});
$('#file_new_dir_submit').click(function() {
$.ajax({
url: 'ajax/newfolder.php',
data: "dir="+$('#dir').val()+"&foldername="+$('#file_new_dir_name').val(),
complete: boolOpFinished
});
});
$('.upload').click(function(){
if($('#file_action_panel').attr('activeAction') != 'upload') {
$('#file_action_panel').attr('activeAction', 'upload');
$('#fileSelector').replaceWith('<input type="file" name="file" id="fileSelector">');
$('#file_action_panel form').css({"display":"none"});
$('#file_upload_form').css({"display":"block"});
}, function() {
$('#file_upload_form').css({"display":"none"});
} else {
$('#file_action_panel').attr('activeAction', 'false');
$('#file_upload_form').css({"display":"none"})
}
return false;
});
$('#file_upload_start').click(function() {
$('#file_upload_target').load(uploadFinished);
$('.new-dir').click(function(){
if($('#file_action_panel').attr('activeAction') != 'new-dir') {
$('#file_action_panel').attr('activeAction', 'new-dir');
$('#file_new_dir_name').val('');
$('#file_action_panel form').css({"display":"none"});
$('#file_newfolder_form').css({"display":"block"})
} else {
$('#file_newfolder_form').css({"display":"none"})
$('#file_action_panel').attr('activeAction', false);
}
return false;
});
});
@ -64,6 +93,24 @@ function uploadFinished() {
}
}
function resetFileActionPanel() {
$('#file_action_panel form').css({"display":"none"});
$('#file_action_panel').attr('activeAction', false);
}
function boolOpFinished(data) {
result = eval("("+data.responseText+");");
if(result.status == 'success'){
$.ajax({
url: 'ajax/list.php',
data: "dir="+$('#dir').val(),
complete: refreshContents
});
} else {
alert(result.data.message);
}
}
function refreshContents(data) {
result = eval("("+data.responseText+");");
if(typeof(result.data.breadcrumb) != 'undefined'){
@ -71,6 +118,7 @@ function refreshContents(data) {
}
updateFileList(result.data.files);
$('#file_upload_button').click();
resetFileActionPanel();
}
function updateBreadcrumb(breadcrumbHtml) {

7
files/templates/index.php
Unescape View File

@ -5,16 +5,15 @@ href="" title="" class="new-dir">New folder</a><a href="" title=""
class="download">Download</a><a href="" title="" class="share">Share</a><a
href="" title="" class="delete">Delete</a>
</p>
<div id="file_upload_form">
<form action="ajax/upload.php"
<div id="file_action_panel">
<form id="file_upload_form" action="ajax/upload.php"
method="post" enctype="multipart/form-data" target="file_upload_target"><input
type="hidden" name="MAX_FILE_SIZE" value="<?php echo $_["uploadMaxFilesize"] ?>" id="max_upload"><input
type="hidden" name="dir" value="<?php echo $_["dir"] ?>" id="dir"><input
type="file" name="file" id="fileSelector"><input type="submit"
id="file_upload_start" value="Upload" /><iframe id="file_upload_target"
name="file_upload_target" src=""></iframe></form>
</div>
<div id="file_action_panel">
<form id="file_newfolder_form"><input type="text" name="file_new_dir_name" id="file_new_dir_name" />&nbsp;<input type="button" id="file_new_dir_submit" name="file_new_dir_submit" value="OK" /></form>
</div>
</div>

6
help/css/help.css
Unescape View File

@ -49,16 +49,16 @@ table td.name a
}
.install a {
.button a {
padding:0.2em 0.5em;
border:1px solid #ddd;
-moz-border-radius:15px;
-webkit-border-radius:15px;
border-radius:15px;
text-decoration: none;
font-size:1.5em; color:#666666;
font-size:1.3em; color:#666666;
background-color:#F0F0F0;
}
.install a:hover {
.button a:hover {
background-color:#DDDDDD;
}

12
help/templates/index.php
Unescape View File

@ -1,10 +1,18 @@
<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>

3
lib/ocsclient.php
Unescape View File

@ -126,7 +126,7 @@ class OC_OCSCLIENT{
* This function returns a list of all the knowledgebase entries from the OCS server
*/
public static function getKnownledgebaseEntries(){
$url='http://api.apps.owncloud.com/v1/knowledgebase/data?page=0&pagesize=10';
$url='http://api.apps.owncloud.com/v1/knowledgebase/data?type=150&page=0&pagesize=10';
$kbe=array();
$xml=file_get_contents($url);
@ -138,6 +138,7 @@ class OC_OCSCLIENT{
$kb['id']=$tmp[$i]->id;
$kb['name']=$tmp[$i]->name;
$kb['description']=$tmp[$i]->description;
$kb['answer']=$tmp[$i]->answer;
$kb['preview1']=$tmp[$i]->smallpreviewpic1;
$kbe[]=$kb;
}

Write Preview
Loading…
Cancel
Save