twingle/twingle/content/toolbar toolbar.js,1.4,1.5 toolbaroverlay.xul,1.6,1.7

Update of /cvs/root/twingle/twingle/content/toolbar
In directory alpha.oscom.org:/tmp/cvs-serv518/content/toolbar

Modified Files:
	toolbar.js toolbaroverlay.xul 
Log Message:
Major cleanup after the sprint.  Also:

1) Started menu/commandset.xul to centralize the commands between 
menus, buttons, and keys.

2) Major cleanup of menu items and buttons, removing things that
   weren't implemented.

3) Added Tasks and Window menus from standard Moz.

4) The "New Site" approach is now a wizard that does some
   user-friendly sniffing at the response.



Index: toolbar.js
===================================================================
RCS file: /cvs/root/twingle/twingle/content/toolbar/toolbar.js,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** toolbar.js	14 Mar 2003 13:05:31 -0000	1.4
--- toolbar.js	19 Mar 2003 17:38:39 -0000	1.5
***************
*** 1,16 ****
  /* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
  
- function openDialogNewContent (resourcetype)
- {
-     /* todo: eliminate this!! it will be replaced by new-style adding */
-     var d = "chrome://twingle/content/workspace/newarticle.xul";
-     window.openDialog(d,"newcontent","chrome",sitesds);
-     return;
- }
- 
- /* Create a site from user provided url to site rsd xml */
- /* http://archipelago.phrasewise.com/rsd  */
- 
- 
  function getSiteConfiguration () {
  
--- 1,4 ----
***************
*** 21,31 ****
  
      function myfunc (e) {
-         //alert('in myfunc');
  	if (p.readyState != 4) {
  	    return;
  	}
  
-         var holder;
- 
  	var status = p.status + ": " + p.statusText + "\n";
  	var status = status + p.getAllResponseHeaders() + "\n\n";
--- 9,16 ----
***************
*** 33,48 ****
  
          if (p.responseXML) {
! 	    var dcns = "http://www.purl.org/dc/1.1#";
!             var oscomns = "http://www.oscom.org/rdf#";
! 
! 	    holder = p.responseXML.getElementsByTagNameNS(dcns,"title")[0];
  	    var title = holder.firstChild.nodeValue;
              
!             var holder = p.responseXML.getElementsByTagNameNS(oscomns,"contentsurl")[0];
  	    var contentsurl = holder.firstChild.nodeValue;
              
              sitesds.addSite(title, contentsurl);
-             
- 
          }
      };
--- 18,30 ----
  
          if (p.responseXML) {
! 	    var holder = p.responseXML
!                 .getElementsByTagNameNS(sitesds.dcns,"title")[0];
  	    var title = holder.firstChild.nodeValue;
              
!             var holder = p.responseXML
!                 .getElementsByTagNameNS(sitesds.oscomrdfns,"contentsurl")[0];
  	    var contentsurl = holder.firstChild.nodeValue;
              
              sitesds.addSite(title, contentsurl);
          }
      };

Index: toolbaroverlay.xul
===================================================================
RCS file: /cvs/root/twingle/twingle/content/toolbar/toolbaroverlay.xul,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** toolbaroverlay.xul	14 Mar 2003 14:16:40 -0000	1.6
--- toolbaroverlay.xul	19 Mar 2003 17:38:39 -0000	1.7
***************
*** 10,23 ****
  
  <toolbar id="twingle-toolbar">
-     <button label="New Content" oncommand="openDialogNewContent();"/>
-           <label control="field_url" value="URL"/>
-           <textbox id="field_url" flex="1" value="http://demos.oscom.org/rsd.xml"/>
-     <button label="New Site"  oncommand="getSiteConfiguration();"/>
-     <button label="Delete Site"  oncommand="sitesds.deleteResource();"/>
-     <!-- <box id="dragAndDropBoxes" /> # uncomment this to see simple drag and drop functionality -->
-     <spring flex="100%" />
-     <image src="" />
  
!   </toolbar>
  
  </overlay>
--- 10,31 ----
  
  <toolbar id="twingle-toolbar">
  
! <button type="menu-button" class="toolbarbutton-1" label="New">
!       <menupopup id="twingle-menu-file-popup">
!          <menuitem label="Article" command="twingle-menu-file-new-article:command"/>
!          <menuseparator/>
!          <menuitem label="Site" command="twingle-menu-file-new-site:command"/>
!       </menupopup>
! </button>
! 
! <button label="Reload Site"  command="twingle-menu-file-reload-site:command"/>
! <button label="Delete"  command="twingle-menu-edit-delete:command"/>
! 
! <!-- <box id="dragAndDropBoxes" /> -->
! 
! <spring flex="100%" />
! <image src="" />
! 
! </toolbar>
  
  </overlay>