aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormistic100 <mistic@piwigo.org>2013-02-13 19:26:34 +0000
committermistic100 <mistic@piwigo.org>2013-02-13 19:26:34 +0000
commit98f08b3ee3e262cf5529aa9af695037f6fbf0c7c (patch)
tree7f7dc0d11e34eccaed56e82cbdb21f26de9e95e8
parent9687732271f8394ea40eeda7f38e9386076b7512 (diff)
feature:2847 Display additional info for API methods fields
git-svn-id: http://piwigo.org/svn/trunk@20750 68402e56-0260-453c-a942-63ccdbb3a9ee
-rw-r--r--include/ws_core.inc.php4
-rw-r--r--tools/ws.htm16
2 files changed, 19 insertions, 1 deletions
diff --git a/include/ws_core.inc.php b/include/ws_core.inc.php
index 78cb5064c..3e1db6647 100644
--- a/include/ws_core.inc.php
+++ b/include/ws_core.inc.php
@@ -572,6 +572,10 @@ Request format: ".@$this->_requestFormat." Response format: ".@$this->_responseF
{
$param_data['defaultValue'] = $options['default'];
}
+ if (isset($options['info']))
+ {
+ $param_data['info'] = $options['info'];
+ }
$res['params'][] = $param_data;
}
return $res;
diff --git a/tools/ws.htm b/tools/ws.htm
index ac5844675..f8270535b 100644
--- a/tools/ws.htm
+++ b/tools/ws.htm
@@ -4,7 +4,9 @@
<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
<title>Piwigo web API (web-services) explorer</title>
+ <link rel="stylesheet" type="text/css" href="http://cdn.jsdelivr.net/tiptip/1.3/tipTip.css">
<script type="text/javascript" src="https://ajax.googleapis.com/ajax/libs/jquery/1.9.0/jquery.min.js"></script>
+ <script type="text/javascript" src="https://cdn.jsdelivr.net/tiptip/1.3/jquery.tipTip.minified.js"></script>
<style type="text/css">
/* BEGIN CSS RESET
@@ -92,6 +94,9 @@
}
a.button:hover {color:#E5FF00;}
+ .methodInfo {float:right;display:inline-block;width:16px;height:16px;font-size:12px;line-height:16px;background:#555;border-radius:8px;font-family:"Times New Roman",sans-serif;font-style:italic;font-weight:bold;text-align:center;color:#fff;}
+ .methodInfo:hover {border:none;text-shadow:none;background:#888;cursor:pointer;color:#fff;}
+
#iframeWrapper {width:100%;height:300px;padding:3px 3px 20px 3px;background:#F9F9F9;border:1px solid #cdcdcd;overflow:hidden;position:relative;}
iframe {width:100%;height:100%;background:#fff;}
</style>
@@ -408,6 +413,7 @@ function fillNewMethod(methodName) {
var isOptional = method.params[i].optional;
var acceptArray = method.params[i].acceptArray;
var defaultValue = method.params[i].defaultValue == null ? '' : method.params[i].defaultValue;
+ var info = method.params[i].info == null ? '' : '<a class="methodInfo" title="'+ method.params[i].info + '">i</a>';
// if an array is direclty printed, the delimiter is a comma where we use a pipe
if (typeof defaultValue == 'object') {
@@ -415,7 +421,7 @@ function fillNewMethod(methodName) {
}
methodParams+= '<tr>'+
- '<td>'+ method.params[i].name +'</td>'+
+ '<td>'+ method.params[i].name + info +'</td>'+
'<td class="mini">'+ (isOptional ? '?':'*') + (acceptArray ? ' []':'') +'</td>'+
'<td class="input"><input type="text" class="methodParameterValue" data-id="'+ i +'" value="'+ defaultValue +'"></td>'+
'<td class="mini"><input type="checkbox" class="methodParameterSend" data-id="'+ i +'" '+ (isOptional ? '':'checked="checked"') +'></td>'+
@@ -435,6 +441,14 @@ function fillNewMethod(methodName) {
$("input.methodParameterValue").change(function() {
$("input.methodParameterSend[data-id='"+ $(this).data('id') +"']").attr('checked', 'checked');
});
+
+ // tiptip
+ $(".methodInfo").tipTip({
+ activation:"click",
+ maxWidth:"300px",
+ defaultPosition:"right",
+ delay:0
+ });
}
// invoke method