';
- str += '
';
-*/
- // custom lable text
- if (action != 'popup') {
- if (data['login_btn_label']) {
- loginform_node.one('.fp-login-submit').setContent(data['login_btn_label'])
- }
- var button_id = login_button_id;
- switch (action) {
- case 'search':
- button_id = search_button_id;
- break;
- case 'download':
- button_id = download_button_id;
- break;
- }
- loginform_node.one('.fp-login-submit').set('id', button_id);
- }
-
- // register buttons
- // process login action
- var login_button = Y.one('#'+login_button_id);
- var scope = this;
- if (login_button) {
- login_button.on('click', function(e){
+ // register button action for login and search
+ if (action == 'login' || action == 'search') {
+ loginform_node.one('.fp-login-submit').on('click', function(e){
e.preventDefault();
- // collect form data
- var data = this.logindata;
- var scope = this;
- var params = {};
- for (var k in data) {
- if(data[k].type!='popup') {
- var el = Y.one('[name='+data[k].name+']');
- var type = el.get('type');
- params[data[k].name] = '';
- if(type == 'checkbox') {
- params[data[k].name] = el.get('checked');
- } else {
- params[data[k].name] = el.get('value');
- }
- }
- }
- // start ajax request
this.hide_header();
this.request({
- 'params': params,
- 'scope': scope,
- 'action':'signin',
+ 'scope': this,
+ 'action':(action == 'search') ? 'search' : 'signin',
'path': '',
'client_id': client_id,
'repository_id': repository_id,
+ 'form': {id:form_id, upload:false, useDisabled:true},
'callback': this.display_response
}, true);
}, this);
}
- var search_button = Y.one('#'+search_button_id);
- if (search_button) {
- search_button.on('click', function(e){
- e.preventDefault();
- var data = this.logindata;
- var params = {};
-
- for (var k in data) {
- if(data[k].type!='popup') {
- var el = document.getElementsByName(data[k].name)[0];
- params[data[k].name] = '';
- if(el.type == 'checkbox') {
- params[data[k].name] = el.checked;
- } else if(el.type == 'radio') {
- var tmp = document.getElementsByName(data[k].name);
- for(var i in tmp) {
- if (tmp[i].checked) {
- params[data[k].name] = tmp[i].value;
- }
- }
- } else {
- params[data[k].name] = el.value;
- }
- }
+ // if 'Enter' is pressed in the form, simulate the button click
+ if (loginform_node.one('.fp-login-submit')) {
+ loginform_node.one('form').on('keydown', function(e) {
+ if (e.keyCode == 13) {
+ loginform_node.one('.fp-login-submit').simulate('click')
+ e.preventDefault();
}
- this.hide_header();
- this.request({
- scope: scope,
- action:'search',
- client_id: client_id,
- repository_id: repository_id,
- form: {id: 'fp-form-'+scope.options.client_id,upload:false,useDisabled:true},
- callback: scope.display_response
- }, true);
}, this);
}
- // TODO not used code?
- var download_button = Y.one('#'+download_button_id);
- if (download_button) {
- download_button.on('click', function(){
- alert('download');
- });
- }
- var popup_button = Y.one('#'+popup_button_id);
- if (popup_button) {
- popup_button.on('click', function(e){
- M.core_filepicker.active_filepicker = this;
- window.open(loginurl, 'repo_auth', 'location=0,status=0,width=500,height=300,scrollbars=yes');
- e.preventDefault();
- }, this);
- }
- var elform = loginform_node.one('form');
- elform.on('keydown', function(e) {
- if (e.keyCode == 13) {
- switch (action) {
- case 'search':
- search_button.simulate('click');
- break;
- default:
- login_button.simulate('click');
- break;
- }
- e.preventDefault();
- }
- }, this);
-
},
display_response: function(id, obj, args) {
var scope = args.scope
@@ -1163,10 +1022,12 @@ M.core_filepicker.init = function(Y, options) {
Y.all('#'+'author-'+client_id).set('value', this.options.author);
Y.all('#'+'license-'+client_id).set('name', 'license');
this.populate_licenses_select(Y.one('#'+'license-'+client_id))
- Y.one('#'+id).append('
'); // TODO nicer!
+ Y.one('#'+id).appendChild(Y.Node.create('
').
+ setAttrs({type:'hidden',name:'itemid',value:this.options.itemid}));
var types = this.options.accepted_types;
for (var i in types) {
- Y.one('#'+id).append('
'); // TODO nicer!
+ Y.one('#'+id).appendChild(Y.Node.create('
').
+ setAttrs({type:'hidden',name:'accepted_types[]',value:types[i]}));
}
var scope = this;
@@ -1247,8 +1108,9 @@ M.core_filepicker.init = function(Y, options) {
// it does not matter what kind of element is {TOOLMANAGEID}, we create a dummy
// element and use it to open url on click event
- var managelnk = Y.Node.create('');
- managelnk.set('id', 'fp-tb-manage-'+client_id+'-link').set('target', '_blank').setStyle('display', 'none');
+ var managelnk = Y.Node.create('
').
+ setAttrs({id:'fp-tb-manage-'+client_id+'-link', target:'_blank'}).
+ setStyle('display', 'none');
Y.one('#fp-tb-'+client_id).append(managelnk);
Y.one('#fp-tb-manage-'+client_id).on('click', function(e) {
e.preventDefault();
@@ -1256,8 +1118,9 @@ M.core_filepicker.init = function(Y, options) {
});
// same with {TOOLHELPID}
- var helplnk = Y.Node.create('
');
- helplnk.set('id', 'fp-tb-help-'+client_id+'-link').set('target', '_blank').setStyle('display', 'none');
+ var helplnk = Y.Node.create('
').
+ setAttrs({id:'fp-tb-help-'+client_id+'-link', target:'_blank'}).
+ setStyle('display', 'none');
Y.one('#fp-tb-'+client_id).append(helplnk);
Y.one('#fp-tb-help-'+client_id).on('click', function(e) {
e.preventDefault();
@@ -1269,6 +1132,12 @@ M.core_filepicker.init = function(Y, options) {
if (Y.one('#fp-tb-'+client_id)) {
Y.one('#fp-tb-'+client_id).addClass('empty');
}
+ if (this.pathbar) {
+ this.pathbar.setContent('').addClass('empty');
+ }
+ if (this.fpnode.one('.fp-paging')) {
+ this.fpnode.one('.fp-paging').setContent('').addClass('empty');
+ }
},
print_header: function() {
var r = this.active_repo;
@@ -1415,7 +1284,7 @@ M.core_filepicker.init = function(Y, options) {
},
print_path: function() {
if (!this.pathbar) { return; }
- this.pathbar.setContent('');
+ this.pathbar.setContent('').addClass('empty');
var p = this.filepath;
if (p && p.length!=0) {
for(var i = 0; i < p.length; i++) {
@@ -1433,8 +1302,6 @@ M.core_filepicker.init = function(Y, options) {
this, p[i].path);
}
this.pathbar.removeClass('empty');
- } else {
- this.pathbar.addClass('empty');
}
},
hide: function() {
diff --git a/repository/renderer.php b/repository/renderer.php
index 7b37831e475..f44beba98f1 100644
--- a/repository/renderer.php
+++ b/repository/renderer.php
@@ -57,6 +57,7 @@ class core_repository_renderer extends plugin_renderer_base {
* Element with class 'fp-path-folder' will contain template for one folder in path toolbar.
* It will hold mouse click event and will be assigned classes first/last/even/odd respectfully.
* The content of element with class 'fp-path-folder-name' will be substituted with folder name;
+ * Parent element will receive class 'empty' when there are no folders to be displayed;
*
* Element with id {TOOLBARID} will have class 'empty' if all 'Search', 'Login', 'Refresh' and
* 'Logout' are unavailable for this repo;
@@ -162,10 +163,18 @@ class core_repository_renderer extends plugin_renderer_base {
* Elements with ids 'wrap-{LINKEXTID}', 'wrap-{AUTHORID}' and 'wrap-{LICENSEID}' may be
* assigned with class 'uneditable' if not applicable for particular repository;
*
+ * When confirm button is pressed and file is being selected, the top element receives
+ * additional class 'loading'. It is removed when response from server is received.
+ *
* @return string
*/
public function js_template_selectlayout() {
- $rv = '