Skip to content
This repository has been archived by the owner on Nov 25, 2020. It is now read-only.

Commit

Permalink
Update ajxp_ role / plugin / repository editors.
Browse files Browse the repository at this point in the history
  • Loading branch information
@cdujeu
cdujeu committed May 5, 2014
1 parent ab5c1d9 commit 767114b
Show file tree
Hide file tree
Showing 6 changed files with 69 additions and 50 deletions.
4 changes: 2 additions & 2 deletions core/src/plugins/editor.ajxp_plugin/manifest.xml
View file
Expand Up @@ -20,8 +20,8 @@
<div id="pluginTabulator">
<div class="action_bar"><a href="#" onclick="return false;" class="icon-save disabled" id="saveButton" onclick="return false;"><img src="AJXP_THEME_FOLDER/images/actions/22/filesave.png" width="22" height="22" alt="AJXP_MESSAGE[53]" border="0"><br><span message_id="53">AJXP_MESSAGE[53]</span></a></div>
<ul class="tabrow">
<li class="selected" data-PaneID="pane-infos"><span ajxp_message_id="ajxp_plugin_editor.3">AJXP_MESSAGE[ajxp_plugin_editor.3]</span></li>
<li class="" data-PaneID="pane-docs"><span ajxp_message_id="ajxp_plugin_editor.4">AJXP_MESSAGE[ajxp_plugin_editor.4]</span></li>
<li class="selected" data-PaneID="pane-infos"><i class="icon-reorder"></i> <span ajxp_message_id="ajxp_plugin_editor.3">AJXP_MESSAGE[ajxp_plugin_editor.3]</span></li>
<li class="" data-PaneID="pane-docs"><i class="icon-book"></i> <span ajxp_message_id="ajxp_plugin_editor.4">AJXP_MESSAGE[ajxp_plugin_editor.4]</span></li>
</ul>
<div class="tabpanes">
</div>
Expand Down
8 changes: 4 additions & 4 deletions core/src/plugins/editor.ajxp_repository/class.RepositoryEditor.js
View file
Expand Up @@ -239,7 +239,7 @@ Class.create("RepositoryEditor", AbstractEditor, {
if(this.currentRepoWriteable){
this.feedMetaSourceForm(xmlData, this.metaPane);
}else{
this.metaPane.update(MessageHash['ajxp_repository_editor.15']);
this.metaPane.down("div.dialogLegend").update(MessageHash['ajxp_repository_editor.15']);
}
}

Expand Down Expand Up @@ -328,8 +328,8 @@ Class.create("RepositoryEditor", AbstractEditor, {
addForm.insert(formEl);
addForm.insert('<div style="clear: both"></div>');
formEl.insert(this.metaSelector);
metaPane.insert({top:addForm});
addForm.insert({before: new Element("div", {className:"dialogLegend"}).update(MessageHash["ajxp_repository_editor.7"])});
metaPane.down("div.dialogLegend").update(MessageHash["ajxp_repository_editor.7"]);
metaPane.down("div.dialogLegend").insert({after:addForm});
var addFormDetail = new Element("div");
addForm.insert(addFormDetail);

Expand All @@ -350,7 +350,7 @@ Class.create("RepositoryEditor", AbstractEditor, {
}
modal.refreshDialogAppearance();
modal.refreshDialogPosition();
addFormDetail.insert("<div class='largeButton' style='width:100px;margin-top: 20px;margin-left: 0; float: right;'><span class='icon-plus-sign'></span> <span>"+MessageHash['ajxp_repository_editor.11']+"</span></div>");
addFormDetail.insert("<div class='largeButton' style='width:100px;margin-top: 20px;margin-left: 0; float: right;'><span class='icon-plus-sign'></span> <span>"+MessageHash['ajxp_repository_editor.11']+"</span></div><div style='clear:both;'></div>");
addFormDetail.down(".largeButton")._form = addForm;
addFormDetail.down(".largeButton").observe("click", this.metaActionClick.bind(this));
this.resize();
Expand Down
40 changes: 11 additions & 29 deletions core/src/plugins/editor.ajxp_repository/manifest.xml
View file
Expand Up @@ -12,27 +12,6 @@
<i18n namespace="ajxp_repository_editor" path="plugins/editor.ajxp_repository/i18n"/>
</resources>
</client_settings>
<registry_contributions>
<actions>
<action name="repo_editor_edit_share">
<gui text="ajxp_conf.93" title="301" iconClass="icon-edit" src="edit.png" accessKey="edit_access_key" hasAccessKey="true">
<context selection="true" dir="" recycle="hidden"
actionBar="true" contextMenu="true" infoPanel="true"
actionBarGroup="repo_editor_shares" inZip="false">
</context>
<selectionContext dir="true" file="true" recycle="false" unique="true" allowedMimes="AJXP_MIMES_EDITABLE" behaviour="disable"/></gui>
<rightsContext noUser="true" userLogged="only" read="true" write="true" adminOnly=""/>
<processing>
<clientCallback prepareModal="false"><![CDATA[
var editorData = window.actionArguments[0];
var manager = window.actionManager;
alert('Should display data about ' + manager.getDataModel().getUniqueFileName());
]]></clientCallback>
<serverCallback methodName="switchAction" developerComment="Shortcut for various actions, calling edit with subaction parameter."/>
</processing>
</action>
</actions>
</registry_contributions>
<clientForm id="repository_edit_box"><![CDATA[
<div id="repository_edit_box" class="tabbed_editor" action="editer" box_width="460" box_height="80%" box_resize="true" box_padding="0">
<div class="editor_header">
Expand All @@ -41,23 +20,26 @@
<div id="repositoryTabulator">
<div class="action_bar"><a href="#" onclick="return false;" class="icon-save disabled" id="saveButton" onclick="return false;"><img src="AJXP_THEME_FOLDER/images/actions/22/filesave.png" width="22" height="22" alt="AJXP_MESSAGE[53]" border="0"><br><span message_id="53">AJXP_MESSAGE[53]</span></a></div>
<ul class="tabrow">
<li class="selected" data-PaneID="pane-infos"><span ajxp_message_id="ajxp_repository_editor.3">AJXP_MESSAGE[ajxp_repository_editor.3]</span></li>
<li class="" data-PaneID="pane-metas"><span ajxp_message_id="ajxp_repository_editor.4">AJXP_MESSAGE[ajxp_repository_editor.4]</span></li>
<li class="" data-PaneID="pane-shares"><span ajxp_message_id="ajxp_repository_editor.4">Shares</span></li>
<li class="selected" data-PaneID="pane-infos"><i class="icon-cogs"></i> <span ajxp_message_id="ajxp_repository_editor.3">AJXP_MESSAGE[ajxp_repository_editor.3]</span></li>
<li class="" data-PaneID="pane-metas"><i class="icon-puzzle-piece"></i> <span ajxp_message_id="ajxp_repository_editor.4">AJXP_MESSAGE[ajxp_repository_editor.4]</span></li>
<li class="" data-PaneID="pane-shares"><i class="icon-share"></i> <span ajxp_message_id="ajxp_repository_editor.4">Shares</span></li>
</ul>
<div class="tabpanes">
</div>
<div id="pane-infos">
</div>
<div id="pane-metas" style="padding:10px 0;">
<div id="pane-metas">
<div class="innerTitle" tabindex="0">Workspace additional features</div>
<div class="dialogLegend" style="padding: 0 20px;"></div>
<div id="metaTabulator" style="clear:both;">
<ul class="tabrow"></ul>
<div class="tabpanes"></div>
<ul class="tabrow innerTabRow"></ul>
<div class="tabpanes innerContainer" style="margin: 3px 10px;padding: 3px;"></div>
</div>
</div>
<div id="pane-shares">
<div id="shares-toolbar"></div>
<div id="shares-list"></div>
<div id="shares-toolbar" style="float: right;margin: 4px 20px;"></div>
<div class="innerTitle" tabindex="0">Shared Files and Folders from this workspace</div>
<div id="shares-list" class="innerContainer"></div>
</div>
</div>
</div>
Expand Down
5 changes: 3 additions & 2 deletions core/src/plugins/editor.ajxp_role/class.RoleEditor.js
View file
Expand Up @@ -671,7 +671,7 @@ Class.create("RoleEditor", AbstractEditor, {
if(!Object.keys(actionsData).length){
parametersPane.update("");
parametersPane.removeClassName("nonempty");
parametersPane.insert(new Element("ul", {className:"tabrow"}));
parametersPane.insert(new Element("ul", {className:"tabrow innerTabRow"}));
return;
}
var conn = new Connexion();
Expand All @@ -684,7 +684,7 @@ Class.create("RoleEditor", AbstractEditor, {

parametersPane.update("");
parametersPane.removeClassName("non_empty");
parametersPane.insert(new Element("ul", {className:"tabrow"}));
parametersPane.insert(new Element("ul", {className:"tabrow innerTabRow"}));

// Parse result as a standard form
var xml = transport.responseXML;
Expand Down Expand Up @@ -732,6 +732,7 @@ Class.create("RoleEditor", AbstractEditor, {
pane.select("div.accordion_content").invoke("setStyle", {display:"block"});
new AjxpSimpleTabs(parametersPane);
parametersPane.addClassName("non_empty");
parametersPane.down(".tabpanes").addClassName("innerContainer").setStyle({margin:'3px 10px'});

// UPDATE FORMS ELEMENTS
parametersPane.select("div.SF_element").each(function(element){
Expand Down
17 changes: 10 additions & 7 deletions core/src/plugins/editor.ajxp_role/manifest.xml
View file
Expand Up @@ -15,10 +15,10 @@
<div id="roleTabulator">
<div class="action_bar"><a href="#" onclick="return false;" class="disabled icon-save" id="saveButton" onclick="return false;"><img src="AJXP_THEME_FOLDER/images/actions/22/filesave.png" width="22" height="22" alt="AJXP_MESSAGE[53]" border="0"><br><span message_id="53">AJXP_MESSAGE[53]</span></a></div>
<ul class="tabrow">
<li class="selected" data-PaneID="pane-infos"><span>AJXP_MESSAGE[ajxp_role_editor.3]</span></li>
<li class="" data-PaneID="pane-acls"><span>AJXP_MESSAGE[ajxp_role_editor.4]</span></li>
<li class="" data-PaneID="pane-actions"><span>AJXP_MESSAGE[ajxp_role_editor.5]</span></li>
<li class="" data-PaneID="pane-parameters"><span>AJXP_MESSAGE[ajxp_role_editor.6]</span></li>
<li class="selected" data-PaneID="pane-infos"><i class="icon-info-sign"></i> <span>AJXP_MESSAGE[ajxp_role_editor.3]</span></li>
<li class="" data-PaneID="pane-acls"><i class="icon-lock"></i> <span>AJXP_MESSAGE[ajxp_role_editor.4]</span></li>
<li class="" data-PaneID="pane-actions"><i class="icon-reorder"></i> <span>AJXP_MESSAGE[ajxp_role_editor.5]</span></li>
<li class="" data-PaneID="pane-parameters"><i class="icon-cog"></i> <span>AJXP_MESSAGE[ajxp_role_editor.6]</span></li>
</ul>
<div class="tabpanes">
</div>
Expand All @@ -30,10 +30,12 @@
<div id="account_custom"></div>
</div>
<div id="pane-acls">
<div class="innerTitle">Access Control List</div>
<div class="dialogLegend">AJXP_MESSAGE[ajxp_role_editor.9]</div>
<div id="acls-selected"></div>
<div id="acls-selected" class="innerContainer"></div>
</div>
<div id="pane-actions">
<div class="innerTitle">Disabled Actions</div>
<div id="actions-selector">
<div class="dialogLegend">AJXP_MESSAGE[ajxp_role_editor.10]</div>
<div class="SF_element">
Expand All @@ -51,9 +53,10 @@
</div>
<div style="clear:both;"></div>
</div>
<div id="actions-selected"></div>
<div id="actions-selected" class="innerContainer"></div>
</div>
<div id="pane-parameters">
<div class="innerTitle">Plugins Parameters Fine-tuning</div>
<div id="parameters-selector">
<div class="dialogLegend">AJXP_MESSAGE[ajxp_role_editor.16]</div>
<div class="SF_element">
Expand All @@ -71,7 +74,7 @@
</div>
<div style="clear:both;"></div>
</div>
<div id="parameters-selected"></div>
<div id="parameters-selected" class="innerContainer"></div>
</div>
</div>
</div>
Expand Down
45 changes: 39 additions & 6 deletions core/src/plugins/editor.ajxp_role/rolesEditor.css
View file
Expand Up @@ -205,15 +205,10 @@ div#account_actions{
div#actions-selected,
div#acls-selected
{

margin: 20px 0 0 0;
border: 0;
background-color: #ffffff;
border-radius: 7px;
margin: 20px;
overflow-y: auto;
padding: 2px;
font-size: 12px;

}

div#parameters-selected{
Expand Down Expand Up @@ -359,4 +354,42 @@ span.m-2 {

div.documentation{
padding: 0 20px !important;
}

#shares-list{
margin: 10px 15px 15px;
}

#shares-list div.header_cell:first-child{
border-radius: 4px 0 0 0;
}
#shares-list div.header_cell:last-child{
border-radius: 0 4px 0 0;
}
#shares-list div.header_label{
padding: 7px 6px 4px;
}
#shares-list div.header_resizer{
max-height: 30px;
}
#shares-list div.paginator{
height: 23px;
padding-top: 6px;
}

#shares-toolbar{
padding: 10px 0 0 24px;
}

.innerContainer{
background-color: #FFFFFF;
border-radius: 3px;
border: 1px solid #F1F1F1;
box-shadow: 0px 1px 1px rgba(0,0,0,0.25);
}

.innerTabRow{
border-radius: 3px;
margin: 0 10px;
box-shadow: 0px 1px 1px rgba(0,0,0,0.15);
}

0 comments on commit 767114b

Please sign in to comment.