[Erp5-report] r21368 - in /erp5admin/trunk: ./ content/erp5admin/
nobody at svn.erp5.org
nobody at svn.erp5.org
Thu Jun 5 22:44:39 CEST 2008
Author: bartek
Date: Thu Jun 5 22:44:38 2008
New Revision: 21368
URL: http://svn.erp5.org?rev=21368&view=rev
Log:
a popup dialog displaying skin layer info about current thing (script, form, whatever); a placeholder for further development.
Added:
erp5admin/trunk/content/erp5admin/location_info.css
erp5admin/trunk/content/erp5admin/location_info.css~
erp5admin/trunk/content/erp5admin/location_info.js
erp5admin/trunk/content/erp5admin/location_info.js~
erp5admin/trunk/content/erp5admin/location_info.xul
erp5admin/trunk/content/erp5admin/location_info.xul~
Modified:
erp5admin/trunk/Makefile
erp5admin/trunk/content/erp5admin/erp5admin.js
erp5admin/trunk/content/erp5admin/erp5admin.xul
erp5admin/trunk/content/erp5admin/erp5admin_async.js
Modified: erp5admin/trunk/Makefile
URL: http://svn.erp5.org/erp5admin/trunk/Makefile?rev=21368&r1=21367&r2=21368&view=diff
==============================================================================
--- erp5admin/trunk/Makefile (original)
+++ erp5admin/trunk/Makefile Thu Jun 5 22:44:38 2008
@@ -1,6 +1,6 @@
all: clean
@mkdir -p chrome
- zip chrome/erp5admin.jar content/erp5admin/*.rdf content/erp5admin/*.xul content/erp5admin/*.js
+ zip chrome/erp5admin.jar content/erp5admin/*.rdf content/erp5admin/*.xul content/erp5admin/*.js content/erp5admin/*.css
zip -r erp5admin.xpi chrome chrome.manifest install.rdf
clean:
Modified: erp5admin/trunk/content/erp5admin/erp5admin.js
URL: http://svn.erp5.org/erp5admin/trunk/content/erp5admin/erp5admin.js?rev=21368&r1=21367&r2=21368&view=diff
==============================================================================
--- erp5admin/trunk/content/erp5admin/erp5admin.js (original)
+++ erp5admin/trunk/content/erp5admin/erp5admin.js Thu Jun 5 22:44:38 2008
@@ -245,6 +245,11 @@
}
form_id = href.substring(begin+1, end);
}else{
+ // maybe we are editing something in portal_skins...
+ res = href.match(/portal_skins\/[^/]+\/([^/]+)/)
+ if(res){
+ return res[1];
+ }
// maybe it is inside the document...
lista = window.content.document.getElementsByTagName('input');
for(i=0; i<lista.length; i++){
Modified: erp5admin/trunk/content/erp5admin/erp5admin.xul
URL: http://svn.erp5.org/erp5admin/trunk/content/erp5admin/erp5admin.xul?rev=21368&r1=21367&r2=21368&view=diff
==============================================================================
--- erp5admin/trunk/content/erp5admin/erp5admin.xul (original)
+++ erp5admin/trunk/content/erp5admin/erp5admin.xul Thu Jun 5 22:44:38 2008
@@ -33,6 +33,11 @@
<toolbar id="erp5admin-toolbar" class="chromeclass-toolbar" collapsed="false" iconsize="small" mode="full" inherits="collapsed,hidden" hidden="false" persist="collapsed,hidden" >
<button label="form" id="manage-form-button" tooltiptext="Manage form" oncommand="erp5admin_gotoFormManage(true)"/>
<button label="object" id="manage-object-button" tooltiptext="Manage object" oncommand="erp5admin_gotoManage('object',true)"/>
+ <menu id="toolbar_form" label="form/script" tooltiptext="Varia">
+ <menupopup>
+ <menuitem label="Position" id="manage-form-location-item" tooltiptext="Manage object" oncommand="erp5admin_showFormLocation();"/>
+ </menupopup>
+ </menu>
<menu id="toolbar_object" label="object" tooltiptext="Object menu" position="1">
<menupopup onpopupshowing="erp5admin_updateObjectMenu();">
<menuitem label="Manage object" id="manage-object-item" tooltiptext="Manage object" oncommand="erp5admin_gotoManage('object',true)"/>
Modified: erp5admin/trunk/content/erp5admin/erp5admin_async.js
URL: http://svn.erp5.org/erp5admin/trunk/content/erp5admin/erp5admin_async.js?rev=21368&r1=21367&r2=21368&view=diff
==============================================================================
--- erp5admin/trunk/content/erp5admin/erp5admin_async.js (original)
+++ erp5admin/trunk/content/erp5admin/erp5admin_async.js Thu Jun 5 22:44:38 2008
@@ -104,6 +104,25 @@
erp5admin_sendRequest(url, erp5admin_editObject);
}
+function erp5admin_showFormLocation(){
+ /*
+ * this gets info what you are working on, which is the default skin for it,
+ * does it overwrite objects in the lower part of skin queue, and where can it be copied for
+ * customisation
+ */
+ form_id = erp5admin_getFormId();
+ if(form_id == false){
+ alert('could not find form_id');
+ return;
+ }
+ url = erp5admin_getSiteURL() + '/Admin_getFormLocationInfo?object_id=' + form_id ;
+ erp5admin_sendRequest(url, erp5admin_displayFormLocation);
+}
+
+function erp5admin_displayFormLocation(val){
+ window.openDialog("chrome://erp5admin/content/location_info.xul", "webdeveloper-about-dialog", "centerscreen,chrome", val);
+}
+
function erp5admin_inspectFromString(newtab){
/*
* find selected text, find name inside it
Added: erp5admin/trunk/content/erp5admin/location_info.css
URL: http://svn.erp5.org/erp5admin/trunk/content/erp5admin/location_info.css?rev=21368&view=auto
==============================================================================
--- erp5admin/trunk/content/erp5admin/location_info.css (added)
+++ erp5admin/trunk/content/erp5admin/location_info.css Thu Jun 5 22:44:38 2008
@@ -1,0 +1,60 @@
+ at import url("chrome://global/skin/");
+ at namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
+
+description
+{
+ margin-left: 0 !important;
+}
+
+separator, #erp5admin-location_info-dialog
+{
+ margin: 0 !important;
+ padding: 0 !important;
+}
+
+#erp5admin-location_info-details
+{
+ background-color: #ffffff !important;
+ color: #000000 !important;
+ padding: 0.5em !important;
+}
+
+#erp5admin-location_info-details hbox
+{
+ background-position: top right !important;
+ background-repeat: no-repeat !important;
+ min-height: 35px !important;
+ padding-right: 35px !important;
+}
+
+.date
+{
+ color: #999999 !important;
+}
+
+.name
+{
+ font-size: x-large !important;
+ padding-right: 0.25em !important;
+}
+
+.name, .title
+{
+ font-weight: bold !important;
+}
+
+.title
+{
+ padding-top: 0.25em !important;
+}
+
+.url
+{
+ color: #0000ff !important;
+ cursor: pointer !important;
+ text-decoration: underline !important;
+}
+.url:hover
+{
+ color: #ff0000 !important;
+}
Added: erp5admin/trunk/content/erp5admin/location_info.css~
URL: http://svn.erp5.org/erp5admin/trunk/content/erp5admin/location_info.css%7E?rev=21368&view=auto
==============================================================================
--- erp5admin/trunk/content/erp5admin/location_info.css~ (added)
+++ erp5admin/trunk/content/erp5admin/location_info.css~ Thu Jun 5 22:44:38 2008
@@ -1,0 +1,60 @@
+ at import url("chrome://global/skin/");
+ at namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
+
+description
+{
+ margin-left: 0 !important;
+}
+
+separator, #webdeveloper-about-dialog
+{
+ margin: 0 !important;
+ padding: 0 !important;
+}
+
+#webdeveloper-about-details
+{
+ background-color: #ffffff !important;
+ color: #000000 !important;
+ padding: 0.5em !important;
+}
+
+#webdeveloper-about-details hbox
+{
+ background-position: top right !important;
+ background-repeat: no-repeat !important;
+ min-height: 35px !important;
+ padding-right: 35px !important;
+}
+
+.date
+{
+ color: #999999 !important;
+}
+
+.name
+{
+ font-size: x-large !important;
+ padding-right: 0.25em !important;
+}
+
+.name, .title
+{
+ font-weight: bold !important;
+}
+
+.title
+{
+ padding-top: 0.25em !important;
+}
+
+.url
+{
+ color: #0000ff !important;
+ cursor: pointer !important;
+ text-decoration: underline !important;
+}
+.url:hover
+{
+ color: #ff0000 !important;
+}
Added: erp5admin/trunk/content/erp5admin/location_info.js
URL: http://svn.erp5.org/erp5admin/trunk/content/erp5admin/location_info.js?rev=21368&view=auto
==============================================================================
--- erp5admin/trunk/content/erp5admin/location_info.js (added)
+++ erp5admin/trunk/content/erp5admin/location_info.js Thu Jun 5 22:44:38 2008
@@ -1,0 +1,58 @@
+function on_location_info_load(){
+ info_dict = parseDict(window.arguments[0]);
+ document.getElementById('form_id').value = info_dict['form_id'];
+ document.getElementById('location').value = info_dict['location'];
+ var cont = document.getElementById('erp5admin-location_info-details');
+ if(info_dict['overwrites'] != null){
+ head = document.createElement('label');
+ head.setAttribute('value', 'Overwrites ' + info_dict['form_id'] + ' in skins:');
+ cont.appendChild(head);
+ for(var i=0;i<info_dict['overwrites'].length;i++){
+ n = document.createElement('label');
+ n.setAttribute('value', info_dict['overwrites'][i]);
+ cont.appendChild(n);
+ }
+ }else{
+ head = document.createElement('label');
+ head.setAttribute('value', '(does not overwrite anything)');
+ cont.appendChild(head);
+ }
+ sep = document.createElement('separator');
+ sep.setAttribute('class', 'groove');
+ cont.appendChild(sep);
+ if(info_dict['customize'] != null){
+ head = document.createElement('label');
+ head.setAttribute('value', 'Can be customized in skins:');
+ cont.appendChild(head);
+ for(var i=0;i<info_dict['customize'].length;i++){
+ n = document.createElement('label');
+ n.setAttribute('value', info_dict['customize'][i]);
+ cont.appendChild(n);
+ }
+ }
+}
+
+function parseDict(s){
+ var dict = new Object();
+ // find lists
+ var lists = s.match(/'[^']+':\s?\[[^]+?\]/g)
+ if(lists != null){
+ for(var i=0;i<lists.length;i++){
+ parms = lists[i].split(':');
+ key = parms[0].replace(/'/g, "");
+ val = parms[1].replace(/'/g, "").replace(/\[/g, "").replace(/\]/g, "").split(',');
+ dict[key] = val;
+ }
+ }
+ // find strings
+ var strs = s.match(/'[^']+':\s?'[^']+?'/g);
+ if(strs != null){
+ for(var i=0;i<strs.length;i++){
+ parms = strs[i].split(':');
+ key = parms[0].replace(/'/g, "");
+ val = parms[1].replace(/'/g, "");
+ dict[key] = val;
+ }
+ }
+ return dict;
+}
Added: erp5admin/trunk/content/erp5admin/location_info.js~
URL: http://svn.erp5.org/erp5admin/trunk/content/erp5admin/location_info.js%7E?rev=21368&view=auto
==============================================================================
--- erp5admin/trunk/content/erp5admin/location_info.js~ (added)
+++ erp5admin/trunk/content/erp5admin/location_info.js~ Thu Jun 5 22:44:38 2008
@@ -1,0 +1,58 @@
+function on_location_info_load(){
+ info_dict = parseDict(window.arguments[0]);
+ document.getElementById('form_id').value = info_dict['form_id'];
+ document.getElementById('location').value = info_dict['location'];
+ var cont = document.getElementById('erp5admin-location_info-details');
+ if(info_dict['overwrites'] != null){
+ head = document.createElement('label');
+ head.setAttribute('value', 'Overwrites ' + info_dict['form_id'] + ' in skins:');
+ cont.appendChild(head);
+ for(var i=0;i<info_dict['overwrites'].length;i++){
+ n = document.createElement('label');
+ n.setAttribute('value', info_dict['overwrites'][i]);
+ cont.appendChild(n);
+ }
+ }else{
+ head = document.createElement('label');
+ head.setAttribute('(does not overwrite anything)');
+ cont.appendChild(head);
+ }
+ sep = document.createElement('separator');
+ sep.setAttribute('class', 'groove');
+ cont.appendChild(sep);
+ if(info_dict['customize'] != null){
+ head = document.createElement('label');
+ head.setAttribute('value', 'Can be customized in skins:');
+ cont.appendChild(head);
+ for(var i=0;i<info_dict['customize'].length;i++){
+ n = document.createElement('label');
+ n.setAttribute('value', info_dict['customize'][i]);
+ cont.appendChild(n);
+ }
+ }
+}
+
+function parseDict(s){
+ var dict = new Object();
+ // find lists
+ var lists = s.match(/'[^']+':\s?\[[^]+?\]/g)
+ if(lists != null){
+ for(var i=0;i<lists.length;i++){
+ parms = lists[i].split(':');
+ key = parms[0].replace(/'/g, "");
+ val = parms[1].replace(/'/g, "").replace(/\[/g, "").replace(/\]/g, "").split(',');
+ dict[key] = val;
+ }
+ }
+ // find strings
+ var strs = s.match(/'[^']+':\s?'[^']+?'/g);
+ if(strs != null){
+ for(var i=0;i<strs.length;i++){
+ parms = strs[i].split(':');
+ key = parms[0].replace(/'/g, "");
+ val = parms[1].replace(/'/g, "");
+ dict[key] = val;
+ }
+ }
+ return dict;
+}
Added: erp5admin/trunk/content/erp5admin/location_info.xul
URL: http://svn.erp5.org/erp5admin/trunk/content/erp5admin/location_info.xul?rev=21368&view=auto
==============================================================================
--- erp5admin/trunk/content/erp5admin/location_info.xul (added)
+++ erp5admin/trunk/content/erp5admin/location_info.xul Thu Jun 5 22:44:38 2008
@@ -1,0 +1,25 @@
+<?xml version="1.0"?>
+<?xml-stylesheet href="chrome://erp5admin/content/location_info.css" type="text/css"?>
+
+<dialog buttons="accept"
+ id="erp5admin-location_info-dialog"
+ title="Form/Script location"
+ xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
+ onload="on_location_info_load();">
+
+ <script type="application/x-javascript" src="chrome://erp5admin/content/erp5admin.js"/>
+ <script type="application/x-javascript" src="chrome://erp5admin/content/location_info.js"/>
+
+ <vbox id="erp5admin-location_info-details">
+ <hbox>
+ <label>Form/Script id:</label>
+ <description id="form_id">Form id</description>
+ </hbox>
+ <hbox>
+ <label>Default location:</label>
+ <description id="location">Default skin</description>
+ </hbox>
+ <separator class="groove"/>
+ </vbox>
+ <separator class="groove"/>
+</dialog>
Added: erp5admin/trunk/content/erp5admin/location_info.xul~
URL: http://svn.erp5.org/erp5admin/trunk/content/erp5admin/location_info.xul%7E?rev=21368&view=auto
==============================================================================
--- erp5admin/trunk/content/erp5admin/location_info.xul~ (added)
+++ erp5admin/trunk/content/erp5admin/location_info.xul~ Thu Jun 5 22:44:38 2008
@@ -1,0 +1,26 @@
+<?xml version="1.0"?>
+<?xml-stylesheet href="chrome://erp5admin/content/location_info.css" type="text/css"?>
+
+<dialog buttons="accept"
+ id="erp5admin-location_info-dialog"
+ title="Form/Script location"
+ xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
+ onload="on_location_info_load();">
+
+ <script type="application/x-javascript" src="chrome://erp5admin/content/erp5admin.js"/>
+ <script type="application/x-javascript" src="chrome://erp5admin/content/location_info.js"/>
+
+ <vbox id="erp5admin-location_info-details">
+ <hbox>
+ <label>Form/Script id:</label>
+ <description id="form_id">Form id</description>
+ </hbox>
+ <hbox>
+ <label>Default location:</label>
+ <description id="location">Default skin</description>
+ </hbox>
+ <separator class="groove"/>
+ <label>Overwrites in skins:</label>
+ </vbox>
+ <separator class="groove"/>
+</dialog>
More information about the Erp5-report
mailing list