Changeset 3394

Timestamp:

May 28, 2007, 1:23:40 PM (16 years ago)

Author:

Martin Svensson

Message:

Replaced the most common guibutton:s with entities

Location:

trunk

Files:

• doc/src/docbook/admindoc/plugin_installation.xml (modified) (10 diffs)
• doc/src/docbook/admindoc/user_administration.xml (modified) (15 diffs)
• doc/src/docbook/developerdoc/plugin_developer.xml (modified) (1 diff)
• doc/src/docbook/faq/faqs.xml (modified) (4 diffs)
• doc/src/docbook/userdoc/annotations.xml (modified) (6 diffs)
• doc/src/docbook/userdoc/array_lims.xml (modified) (20 diffs)
• doc/src/docbook/userdoc/biomaterials.xml (modified) (25 diffs)
• doc/src/docbook/userdoc/experiments.xml (modified) (6 diffs)
• doc/src/docbook/userdoc/file_system.xml (modified) (6 diffs)
• doc/src/docbook/userdoc/import_export_data.xml (modified) (12 diffs)
• doc/src/docbook/userdoc/project_permission.xml (modified) (6 diffs)
• doc/src/docbook/userdoc/rawbioassays.xml (modified) (1 diff)
• doc/src/docbook/userdoc/reporters.xml (modified) (6 diffs)
• doc/src/docbook/userdoc/trashcan.xml (modified) (1 diff)
• doc/src/docbook/userdoc/webclient.xml (modified) (21 diffs)
• lib/docbook/preprocess/dweiss-docbook-extensions.dtd (modified) (1 diff)

trunk/doc/src/docbook/admindoc/plugin_installation.xml

@@ -84 +84 @@
         <guisubmenu>Plugins</guisubmenu>
         <guimenuitem>Definitions</guimenuitem>
-      </menuchoice> and click on the <guibutton>New&hellip;</guibutton>
+      </menuchoice> and click on the &gbNew;
       button.
     </para>
@@ -211 +211 @@
       
       <para>
-        Click on <guibutton>Save</guibutton> to finish the registration
-        or on <guibutton>Cancel</guibutton> to abort.
+        Click on &gbSave; to finish the registration
+        or on &gbCancel; to abort.
       </para>
       
@@ -280 +280 @@
             button. Select the <emphasis>Base1PluginExecuter</emphasis>
             plug-in. The list of configurations should include the newly
-            installed plug-in. Select it and click on <guibutton>Next</guibutton>.
+            installed plug-in. Select it and click on &gbNext;.
           </para>
         </listitem>
@@ -576 +576 @@
     
     <para>
-      Click on the <guibutton>New&hellip;</guibutton> button
+      Click on the &gbNew; button
       to create a new configuration.
     </para>
@@ -630 +630 @@
     
       <para>
-        Use the <guibutton>Save</guibutton> button to save the
+        Use the &gbSave; button to save the
         configuration or the <guibutton>Save and configure</guibutton>
         button to save and then start the configuration wizard.
@@ -715 +715 @@
           <listitem>
             <para>
-              When the user clicks <guibutton>Next</guibutton>
+              When the user clicks &gbNext;
               the entered values are sent to the plug-in which 
               validate the correctness. The plug-in may return
@@ -865 +865 @@
           <para>
             The path and filename of the file to use for testing.
-            Use the <guibutton>Browse</guibutton> button to 
+            Use the &gbBrowse; button to 
             select a file from the BASE file system or upload
             a new file. Click on the <guibutton>Parse the file</guibutton>
@@ -939 +939 @@
           
           <para>
-            Use the <guibutton>Predefined</guibutton> button to select from a
+            Use the &gbPredefined; button to select from a
             list of common regular expressions.
           </para>
@@ -952 +952 @@
             A regular expression used to split a data line into columns. For
             example, <userinput>\t</userinput> to split on tabs. Use 
-            <guibutton>Predefined</guibutton> button to select from a list of 
+            &gbPredefined; button to select from a list of 
             common regular expressions.
           </para>
@@ -965 +965 @@
             For example, <userinput>\#.*</userinput> to ignore all lines starting with 
             a #. Use 
-            <guibutton>Predefined</guibutton> button to select from a list of 
+            &gbPredefined; button to select from a list of 
             common regular expressions.
           </para>

trunk/doc/src/docbook/admindoc/user_administration.xml

@@ -212 +212 @@
           <para>
             Go to the other tabs if there are any changes to do otherwise press
-            <guibutton>Save</guibutton>
+            &gbSave;
             to save the values or
-            <guibutton>Cancel</guibutton>
+            &gbCancel;
             to abort.
           </para>
@@ -325 +325 @@
           <para>
             Go to the other tabs if there are any changes to do otherwise press
-            <guibutton>Save</guibutton>
+            &gbSave;
             to save the values or
-            <guibutton>Cancel</guibutton>
+            &gbCancel;
             to abort.
           </para>
@@ -363 +363 @@
                 Opens a popup window that allows you to select
                 groups. In the popup window, mark
-                one or more groups and click on the <guibutton>Ok</guibutton>
+                one or more groups and click on the &gbOk;
                 button. The popup window will not list groups that 
                 the user already is a member of.
@@ -376 +376 @@
                 Opens a popup window that allows you to select
                 roles. In the popup window, mark
-                one or more roles and click on the <guibutton>Ok</guibutton>
+                one or more roles and click on the &gbOk;
                 button. The popup window will not list roles that 
                 the user already is a member of.
@@ -397 +397 @@
           <para>
             Go to the other tabs if there are any changes to do otherwise press
-            <guibutton>Save</guibutton>
+            &gbSave;
             to save the values or
-            <guibutton>Cancel</guibutton>
+            &gbCancel;
             to abort.
           </para>
@@ -497 +497 @@
             <guilabel>Members</guilabel>,
             if there are any changes to do otherwise use
-            <guibutton>Save</guibutton>
+            &gbSave;
             to save the settings or
-            <guibutton>Cancel</guibutton>
+            &gbCancel;
             to abort.
           </para>
@@ -536 +536 @@
                 Opens a popup window that allows you to add
                 users to the group. In the popup window, mark
-                one or more users and click on the <guibutton>Ok</guibutton>
+                one or more users and click on the &gbOk;
                 button. The popup window will not list users that 
                 are already members of the group.
@@ -549 +549 @@
                 Opens a popup window that allows you to add
                 other groups to the group. In the popup window, mark
-                one or more groups and click on the <guibutton>Ok</guibutton>
+                one or more groups and click on the &gbOk;
                 button. The popup window will not list groups that 
                 are already members of the group.
@@ -571 +571 @@
           <para>
             Go to the other tab if there are any changes to do, otherwise use
-            <guibutton>Save</guibutton>
+            &gbSave;
             to save the values or
-            <guibutton>Cancel</guibutton>
+            &gbCancel;
             to abort.
           </para>
@@ -728 +728 @@
             Set the properties and proceed then to either one of the other tabs or by
             clicking on one of the buttons:
-            <guibutton>Save</guibutton>
+            &gbSave;
             to save the changes or
-            <guibutton>Cancel</guibutton>
+            &gbCancel;
             to abort.
           </para>
@@ -811 +811 @@
             Set the role's permission on each one of the item types and proceed then to
             one of the other tabs or click on 
-            <guibutton>Save</guibutton>
+            &gbSave;
             to save the changes or
-            <guibutton>Cancel</guibutton>
+            &gbCancel;
             to abort.
           </para>
@@ -843 +843 @@
                 Select the users that should be added from the list in the
                 pop-up window. Click on the
-                <guibutton>Ok</guibutton>
+                &gbOk;
                 button to close the pop-up window and add the selected users.
               </para>
@@ -859 +859 @@
           <para>
             Press
-            <guibutton>Save</guibutton>
+            &gbSave;
             to save the role or go to one of the other tabs if there are more that needs
             to be set. Use
-            <guibutton>Close</guibutton>
+            &gbClose;
             to abort and close the window without saving the changes.
           </para>
@@ -941 +941 @@
           <para>
             Go to the other tab if there are values that haven't been set. Otherwise use
-            <guibutton>Save</guibutton>
+            &gbSave;
             to save the settings or
-            <guibutton>Cancel</guibutton>
+            &gbCancel;
             to abort.
           </para>
@@ -1007 +1007 @@
           <para>
             When everything have been set the quota is saved by using
-            <guibutton>Save</guibutton>. To discard changes use
-            <guibutton>Cancel</guibutton>.
+            &gbSave;. To discard changes use
+            &gbCancel;.
           </para>
         </helptext>

trunk/doc/src/docbook/developerdoc/plugin_developer.xml

@@ -305 +305 @@
                 by the core. Client applications (such as the web client) will probably
                 use this information to group the plug-ins, i.e., a button labeled 
-                <guibutton>Export</guibutton>
+                &gbExport;
                 will let you select among the export plug-ins.
               </para>

trunk/doc/src/docbook/faq/faqs.xml

@@ -156 +156 @@
                 <para>
                   Click on the
-                  <guibutton>Import</guibutton>
+                  &gbImport;
                   in the button. If you don't see it, it means that you have not
                   enough priviledges (contact the administrator)
@@ -197 +197 @@
                 <para>
                   To do so, Go to View, Reporters, click on
-                  <guibutton>Import</guibutton>
+                  &gbImport;
                   . This starts a
                   <guilabel>Reporter Importer Plugin</guilabel>
@@ -377 +377 @@
             <para>
               I need to create a new Hardware type but the
-              <guibutton>New...</guibutton>
+              &gbNew;
               button is grey and does not work. Why?
             </para>
@@ -469 +469 @@
               I have read that I could batch-import an Experiment but I can not see
               the
-              <guibutton>import</guibutton>
+              &gbImport;
               button from the interface. Why?
             </para>

trunk/doc/src/docbook/userdoc/annotations.xml

@@ -58 +58 @@
                 </menuchoice>
             </para>
-            <para> Click on <guibutton>New&hellip;</guibutton> and select one of the 8 different
+            <para> Click on &gbNew; and select one of the 8 different
                 types which can be split in 4 main groups</para>
             <itemizedlist spacing="compact">
@@ -272 +272 @@
                 </menuchoice>
             </para>
-            <para>Click on <guibutton>New&hellip;</guibutton></para>
+            <para>Click on &gbNew;</para>
             <para>a pop-up window opens.</para>
             <para>It contains 2 tabs, one for declaring name and description of the newly created
@@ -351 +351 @@
             <sect3 id="annotations.manage.batchupload.pluginconfig">
                 <title>Configuring the CV loader plugin</title>
-                <para>From the plugin configuration page, Use the <guibutton>Import</guibutton>
+                <para>From the plugin configuration page, Use the &gbImport;
                     button to load the xml configuration file available here. Please refer to <xref
                         linkend="plugins"/> for more ample explanations about plugin configuration.</para>
@@ -367 +367 @@
                 <title>Running the plugin</title>
                 <para>-From the Annotation Type List View page, click on the
-                    <guibutton>Import</guibutton> Button (which shows up only when the import plugin
+                    &gbImport; Button (which shows up only when the import plugin
                     has been configured).</para>
                 <para>-Supply path to tab delimited file containing the Annotation Type to be
-                    imported. Click <guibutton>Next</guibutton>. </para>
+                    imported. Click &gbNext;. </para>
                 <figure id="write_docbook_doc.figures.batchloading-annotationtype-2">
                     <title>Running the CVloader plugin: specifying the file</title>
@@ -382 +382 @@
                 </figure>
                 <para>Define whether or not to update existing Annotation Types and click
-                        <guibutton>Next</guibutton></para>
+                        &gbNext;</para>
                 <figure id="write_docbook_doc.figures.batchloading-annotationtype-3">
                     <title>Running the CVloader plugin in update mode</title>
@@ -393 +393 @@
                       </screenshot>
                 </figure>
-                <para> Click <guibutton>Finish</guibutton> to launch the plugin execution. If one
+                <para> Click &gbFinish; to launch the plugin execution. If one
                     selects the email notification option, a message will be sent upon job
                     completion detailing success or failure of the import process. </para>

trunk/doc/src/docbook/userdoc/array_lims.xml

@@ -78 +78 @@
       <para>The ArrayDesign List view now presents all ArrayDesigns available to the user
         (shared to or owned by).</para>
-      <para>Click on <guibutton>New&hellip;</guibutton> button</para>
+      <para>Click on &gbNew; button</para>
       <para>A 'Create' pop-up window opens. It contains 3 tabs</para>
 
@@ -174 +174 @@
 
       </variablelist>
-      <para>Click on the <guibutton>Save</guibutton> button to store the information in BASE2 or on the
-          <guibutton>Cancel</guibutton> button to abort. </para>
+      <para>Click on the &gbSave; button to store the information in BASE2 or on the
+          &gbCancel; button to abort. </para>
       <para>Upon saving, the Array Design List View page is displayed. Users should pay
         attention to the column <guilabel>Has features</guilabel>. Unless an Affymetrix
@@ -201 +201 @@
         are handled differently. For Affymetrix platform, features are considered imported
         when the Affymetrix CDF file is actually uploaded.</para>
-      <para>From the ArrayDesign Item View, click on the <guibutton>Import</guibutton>
+      <para>From the ArrayDesign Item View, click on the &gbImport;
       button.</para>.<note>
         <para>The button only shows up if the logged in user has enough permissions.</para>
@@ -240 +240 @@
         <listitem>
           <para> Alternately, navigating to the ArrayDesign Item View, one can hit the
-              <guibutton>Edit&hellip;</guibutton> to performed the task.</para>
+              &gbEdit; to performed the task.</para>
           <para>In both cases, an Edit pop-up windows opens. It is essentially identical
             to a Create window and allows updating information about a particular
@@ -270 +270 @@
       <itemizedlist>
         <listitem>
-          <para>Select one or more ArrayDesigns and click <guibutton>Delete</guibutton>
+          <para>Select one or more ArrayDesigns and click &gbDelete;
             button in the menu bar. </para>
           <para>All the selected ArrayDesigns have been marked as deleted and are no
@@ -284 +284 @@
         <listitem>
           <para>Alternately, navigating to the ArrayDesign Item View, one can hit the
-              <guibutton>Delete</guibutton> to performed the task. </para>
+              &gbDelete; to performed the task. </para>
         </listitem>
         <listitem>
@@ -291 +291 @@
             <guilabel>Removed</guilabel> option in the
             <guilabel>view/preset&hellip;</guilabel> filter) and hit the
-              <guibutton>Restore</guibutton> button to performed the task. </para>
+              &gbRestore; button to performed the task. </para>
         </listitem>
       </itemizedlist>
@@ -326 +326 @@
               <guimenuitem>Array batches</guimenuitem>
             </menuchoice></para>
-          <para>Click on <guibutton>New&hellip;</guibutton> button </para>
+          <para>Click on &gbNew; button </para>
         </listitem>
       </orderedlist>
@@ -354 +354 @@
         </listitem>
       </itemizedlist>
-      <para>Click on the <guibutton>Save</guibutton> button to store the information in BASE2 or on the 
-      <guibutton>Cancel</guibutton> button to abort.</para>
+      <para>Click on the &gbSave; button to store the information in BASE2 or on the 
+      &gbCancel; button to abort.</para>
     </sect2>
 
@@ -368 +368 @@
         <listitem>
           <para> Alternately, navigating to the ArrayBatch Item View, one can hit the
-              <guibutton>Edit&hellip;</guibutton> to performed the task.</para>
+              &gbEdit; to performed the task.</para>
           <para>In both cases, an Edit pop-up windows opens. It is essentially identical
             to a Create window and allows updating information about a particular
@@ -396 +396 @@
       <itemizedlist>
         <listitem>
-          <para>Select one or more ArrayBatches and click <guibutton>Delete</guibutton>
+          <para>Select one or more ArrayBatches and click &gbDelete;
             button in the menu bar. </para>
           <para>All the selected ArrayBatches have been marked as deleted and are no
@@ -410 +410 @@
         <listitem>
           <para>Alternately, navigating to the ArrayBatch Item View, one can hit the
-              <guibutton>Delete</guibutton> to performed the task. </para>
+              &gbDelete; to performed the task. </para>
         </listitem>
         <listitem>
@@ -417 +417 @@
             <guilabel>Removed</guilabel> option in the
             <guilabel>view/preset&hellip;</guilabel> filter) and hit the
-              <guibutton>Restore</guibutton> button to performed the task. </para>
+              &gbRestore; button to performed the task. </para>
         </listitem>
       </itemizedlist>
@@ -458 +458 @@
               <guimenuitem>Array slides</guimenuitem>
             </menuchoice></para>
-          <para>Click on <guibutton>New&hellip;</guibutton> button </para>
+          <para>Click on &gbNew; button </para>
         </listitem>
       </orderedlist>
@@ -477 +477 @@
         </listitem>
       </itemizedlist>
-      <para>Click on the <guibutton>Save</guibutton> button to store the information in BASE2 or on the 
-          <guibutton>Cancel</guibutton> button to abort. </para>
+      <para>Click on the &gbSave; button to store the information in BASE2 or on the 
+          &gbCancel; button to abort. </para>
 
       <para> In addition to this classic way of creating BASE items, Arrays Slides can be
@@ -511 +511 @@
       </figure>
       <para>Fill in the necessary information as exhaustively as possible.</para>
-      <para>Click on the <guibutton>Save</guibutton> button to store the information in BASE2 
-      or on the <guibutton>Cancel</guibutton> button to abort. </para>
+      <para>Click on the &gbSave; button to store the information in BASE2 
+      or on the &gbCancel; button to abort. </para>
     </sect2>
 
@@ -525 +525 @@
         <listitem>
           <para> Alternately, navigating to the ArraySlide Item View, one can hit the
-              <guibutton>Edit&hellip;</guibutton> to performed the task.</para>
+              &gbEdit; to performed the task.</para>
           <para>In both cases, an Edit pop-up windows opens. It is essentially identical
             to a Create window and allows updating information about a particular
@@ -554 +554 @@
       <itemizedlist>
         <listitem>
-          <para>Select one or more ArraySlides and click <guibutton>Delete</guibutton>
+          <para>Select one or more ArraySlides and click &gbDelete;
             button in the menu bar. </para>
           <para>All the selected ArraySlides have been marked as deleted and are no longer
@@ -568 +568 @@
         <listitem>
           <para>Alternately, navigating to the ArraySlide Item View, one can hit the
-              <guibutton>Delete</guibutton> to performed the task. </para>
+              &gbDelete; to performed the task. </para>
         </listitem>
         <listitem>
@@ -575 +575 @@
             <guilabel>Removed</guilabel> option in the
             <guilabel>view/preset&hellip;</guilabel> filter) and hit the
-              <guibutton>Restore</guibutton> button to performed the task. </para>
+              &gbRestore; button to performed the task. </para>
         </listitem>
       </itemizedlist>

trunk/doc/src/docbook/userdoc/biomaterials.xml

@@ -56 +56 @@
      <guimenu>View</guimenu>
      <guimenuitem>BioSources</guimenuitem>
-    </menuchoice> , Click on <guibutton>New&hellip;</guibutton> button </para>
+    </menuchoice> , Click on &gbNew; button </para>
    <para> A 'Create' pop-up window opens, it contains 2 tabs: <guilabel>Biosource</guilabel> and
      <guilabel>Annotations</guilabel>. </para>
@@ -239 +239 @@
    <itemizedlist>
     <listitem>
-     <para> Select one or more BioSources and click <guibutton>Delete</guibutton> button in the menu
+     <para> Select one or more BioSources and click &gbDelete; button in the menu
       bar. </para>
      <para> All the selected BioSources have been marked as deleted and are no longer available from
@@ -253 +253 @@
     <listitem>
      <para> Alternately, navigating to the BioSource Item View, hitting the
-      <guibutton>Delete</guibutton> will perform the task.</para>
+      &gbDelete; will perform the task.</para>
      <para> As shown in the next picture, the BioSource is then marked with the <inlinemediaobject>
        <imageobject>
@@ -273 +273 @@
      <para>Deletion errors can be easily recovered. Select the item to recover from the List View
       (be sure to check the <guilabel>Removed</guilabel> option in the View/preset.. filter) and hit
-      the <guibutton>Restore</guibutton> to performed the task. </para>
+      the &gbRestore; to performed the task. </para>
     </listitem>
    </itemizedlist>
@@ -326 +326 @@
        <guimenu>View</guimenu>
        <guimenuitem>BioSamples</guimenuitem>
-      </menuchoice> , Click on <guibutton>New&hellip;</guibutton> button </para>
+      </menuchoice> , Click on &gbNew; button </para>
      <para> A 'Create' pop-up window opens, it contains 4 tabs: <guilabel>Sample</guilabel>,
        <guilabel>Parents</guilabel>, <guilabel> Annotations &amp; parameters</guilabel> and
@@ -490 +490 @@
      <para>The Sample List View page menu bar contains an additionnal button the usage of which is
       detailed now.</para>
-     <para>The <guibutton>Pool&hellip;</guibutton> button <inlinemediaobject>
+     <para>The &gbPool; button <inlinemediaobject>
        <imageobject>
         <imagedata fileref="figures/new_pooled.gif" format="GIF"/>
@@ -524 +524 @@
    <itemizedlist>
     <listitem>
-     <para> Select one or more Samples and click <guibutton>Delete</guibutton> button in the menu
+     <para> Select one or more Samples and click &gbDelete; button in the menu
       bar. </para>
      <para> All the selected Samples have been marked as deleted and are no longer available from
@@ -534 +534 @@
     <listitem>
      <para> Alternately, navigating to the Sample Item View, one can hit the
-      <guibutton>Delete</guibutton> to performed the task. As showen in the next picture, the Sample
+      &gbDelete; to performed the task. As showen in the next picture, the Sample
       is then flagged with the <guiicon>This item has been flagged for deletion</guiicon>
      </para>
@@ -551 +551 @@
      <para>Deletion errors can be easily recovered. Select the item to recover from the List View
       (be sure to check the <guilabel>removed</guilabel> option in the View/preset.. filter) and hit
-      the <guibutton>Restore</guibutton> to performed the task. </para>
+      the &gbRestore; to performed the task. </para>
     </listitem>
    </itemizedlist>
@@ -598 +598 @@
        <guimenu>View</guimenu>
        <guimenuitem>Extracts</guimenuitem>
-      </menuchoice> , Click on <guibutton>New&hellip;</guibutton> button </para>
+      </menuchoice> , Click on &gbNew; button </para>
      <para> A 'Create' pop-up window opens, it contains 4 tabs: <guilabel>Extract</guilabel>,
        <guilabel>Parents</guilabel>, <guilabel> Annotations &amp; parameters</guilabel> and
@@ -743 +743 @@
     <listitem>
      <para>Using the Pool button in the Menu bar</para>
-     <para>The Sample List View page menu bar contains an addition <guibutton>Pool&hellip;</guibutton>
+     <para>The Sample List View page menu bar contains an addition &gbPool;
       <inlinemediaobject>
        <imageobject>
@@ -749 +749 @@
        </imageobject>
       </inlinemediaobject> button, the usage of which is detailed now.</para>
-     <para>The <guibutton>Pool&hellip;</guibutton>
+     <para>The &gbPool;
       <inlinemediaobject>
        <imageobject>
@@ -781 +781 @@
    <itemizedlist>
     <listitem>
-     <para> Select one or more Extract and click <guibutton>Delete</guibutton> button in the menu
+     <para> Select one or more Extract and click &gbDelete; button in the menu
       bar.</para>
      <para> All the selected Extracts have been marked as deleted and are no longer available from
@@ -791 +791 @@
     <listitem>
      <para> Alternately, navigating to the Extract Item View, one can hit the
-      <guibutton>Delete</guibutton> to performed the task.</para>
+      &gbDelete; to performed the task.</para>
      <para> As shown in the next picture, the Extract is then marked with the <guilabel>This item
        has been flagged for deletion</guilabel>
@@ -809 +809 @@
      <para>Deletion errors at this stage can be easily recovered. Select the item to recover from
       the List View (be sure to check the <guilabel>removed</guilabel> option in the View/preset..
-      filter) and hit the <guibutton>Restore</guibutton> to performed the task. </para>
+      filter) and hit the &gbRestore; to performed the task. </para>
     </listitem>
    </itemizedlist>
@@ -846 +846 @@
     </screenshot>
    </figure>
-   <para>Note the <guibutton>New labeled extract</guibutton> button available from this page. For
+   <para>Note the <guibutton>New labeled extract&hellip;</guibutton> button available from this page. For
     more detailed about creating Labeled extracts, see <xref linkend="labeledextract.manage"/></para>
 
@@ -852 +852 @@
   <sect2 id="label.create">
    <title>Creating Labels</title>
-   <para> Click on <guibutton>New&hellip;</guibutton> button, a pop-up window opens. Fill in
+   <para> Click on &gbNew; button, a pop-up window opens. Fill in
     Name and description if required. Label item are very simple object and do not bear association
     to Annotation Type. </para>
@@ -894 +894 @@
        <guimenu>View</guimenu>
        <guimenuitem>Labeled Extracts</guimenuitem>
-      </menuchoice> , Click on <guibutton>New&hellip;</guibutton> button </para>
+      </menuchoice> , Click on &gbNew; button </para>
      <para> A 'Create' pop-up window opens, it contains 4 tabs: <guilabel>Labeled
       Extract</guilabel>, <guilabel>Parents</guilabel>, <guilabel> Annotations &amp;
@@ -1045 +1045 @@
      <para>Using the Pool button in the Menu bar</para>
      <para>The Labeled Extracts List View page menu bar contains an addition
-       <guibutton>Pool&hellip;</guibutton> button, the usage of which is detailed now.</para>
-     <para>The <guibutton>Pool&hellip;</guibutton> button <inlinemediaobject>
+       &gbPool; button, the usage of which is detailed now.</para>
+     <para>The &gbPool; button <inlinemediaobject>
        <imageobject>
         <imagedata fileref="figures/new_pooled.gif" format="GIF"/>
@@ -1077 +1077 @@
    <itemizedlist>
     <listitem>
-     <para> Select one or more Labeled Extract and click <guibutton>Delete</guibutton> button in the
+     <para> Select one or more Labeled Extract and click &gbDelete; button in the
       menu bar. </para>
      <para> All the selected Labeled Extracts have been marked as deleted and are no longer
@@ -1087 +1087 @@
     <listitem>
      <para> Alternately, navigating to the Labeled Extract Item View, one can hit the
-       <guibutton>Delete</guibutton> to performed the task. As showed in the next picture, the
+       &gbDelete; to performed the task. As showed in the next picture, the
       Labeled Extract is then marked with the <inlinemediaobject>
        <imageobject>
@@ -1109 +1109 @@
      <para>Deletion errors at this stage can be easily recovered. Select the item to recover from
       the List View (be sure to check the <guilabel>Removed</guilabel> option in the View/preset..
-      filter) and hit the <guibutton>Restore</guibutton> to performed the task. </para>
+      filter) and hit the &gbRestore; to performed the task. </para>
     </listitem>
    </itemizedlist>
@@ -1166 +1166 @@
        <guimenu>View</guimenu>
        <guimenuitem>Hybridizations</guimenuitem>
-      </menuchoice> , Click on <guibutton>New&hellip;</guibutton>
+      </menuchoice> , Click on &gbNew;
      </para>
      <figure id="write_docbook_doc.figures.hyb-create">
@@ -1397 +1397 @@
    <itemizedlist>
     <listitem>
-     <para> Select one or more Hybridization Items and click on the <guibutton>Delete</guibutton>
+     <para> Select one or more Hybridization Items and click on the &gbDelete;
       button in the menu bar. </para>
      <para> All the selected Hybridizations have been marked as deleted and are no longer available
@@ -1407 +1407 @@
     <listitem>
      <para> Alternately, navigating to the Hybridization Item View, one can hit the
-       <guibutton>Delete</guibutton> to performed the task. As shown in the next picture, the
+       &gbDelete; to performed the task. As shown in the next picture, the
       Hybridization is then marked with the <inlinemediaobject>
        <imageobject>

trunk/doc/src/docbook/userdoc/experiments.xml

@@ -102 +102 @@
             selected raw bioassays are already filled in. Use the 
             <guibutton>Add raw bioassays</guibutton> button to add more
-            raw bioassays or the <guibutton>Remove</guibutton> button
+            raw bioassays or the &gbRemove; button
             to remove the selected raw bioassays from the list.
           </para>
@@ -120 +120 @@
       
       <para>
-        Click on the <guibutton>Save</guibutton> button to save the
-        changes or on <guibutton>Cancel</guibutton> to abort.
+        Click on the &gbSave; button to save the
+        changes or on &gbCancel; to abort.
       </para>
       
@@ -223 +223 @@
         
         <para>
-          Click on the <guibutton>Save</guibutton> button to save the
-          changes or on <guibutton>Cancel</guibutton> to abort.
+          Click on the &gbSave; button to save the
+          changes or on &gbCancel; to abort.
         </para>
       
@@ -259 +259 @@
         Use the <guibutton>Add annotation types</guibutton> button to
         select the annotation types that should be used as experimental 
-        factors. The <guibutton>Remove</guibutton> button removes the 
+        factors. The &gbRemove; button removes the 
         selected annotation types.
       </para>
 
       <para>
-        Click on the <guibutton>Save</guibutton> button to save the
-        changes or on <guibutton>Cancel</guibutton> to abort.
+        Click on the &gbSave; button to save the
+        changes or on &gbCancel; to abort.
       </para>
       
@@ -602 +602 @@
         
         <para>
-          Click on the <guibutton>Save</guibutton> button
+          Click on the &gbSave; button
           to use the current settings. The display will
           automatically refresh itself.
@@ -630 +630 @@
         
         <para>
-          Click on the <guibutton>Save</guibutton> button
-          to save the preset or <guibutton>Cancel</guibutton>
+          Click on the &gbSave; button
+          to save the preset or &gbCancel;
           to abort.
         </para>

trunk/doc/src/docbook/userdoc/file_system.xml

@@ -355 +355 @@
           Finish the configuration by clicking on either
           <guibutton>Upload</guibutton>, which will start uploading the selected file, or
-          <guibutton>Cancel</guibutton> to abort the upload procedure.
+          &gbCancel; to abort the upload procedure.
         </para>
       </helptext>
@@ -382 +382 @@
       <para>
         The edit window to set a file's property in can either be open with
-        <guibutton>Edit&hellip;</guibutton>
+        &gbEdit;
         that is located in the toolbar at the file's view page or by holding down
         <keycap>CTRL</keycap>, <keycap>ALT</keycap>
@@ -469 +469 @@
         <para>
           Finish the editing process by pressing either
-          <guibutton>Save</guibutton>
+          &gbSave;
           to save the properties to the database or
-          <guibutton>Cancel</guibutton>
+          &gbCancel;
           to abort and discard the changes.
         </para>
@@ -507 +507 @@
           Choose a directory which the selected items should be moved to. It
           is possible to create new subdirectories with the 
-          <guibutton>New&hellip;</guibutton> button.
+          &gbNew; button.
         </para>
         <para>
           Click on
-          <guibutton>Ok</guibutton>
+          &gbOk;
           to carry out the move or
-          <guibutton>Cancel</guibutton>
+          &gbCancel;
           to abort.
         </para>
@@ -626 +626 @@
         <para>
           Close the pop-up window and return to file page with
-          <guibutton>Close</guibutton>.
+          &gbClose;.
         </para>
       </sect3>
@@ -700 +700 @@
           <para>
             The editing process is completed with either
-            <guibutton>Save</guibutton>, to save the properties into the database, or with
-            <guibutton>Cancel</guibutton>
+            &gbSave;, to save the properties into the database, or with
+            &gbCancel;
             to discard the changes. Both of the buttons will close the edit window and
             if the directory is updated the list will be reloaded with the directory's

trunk/doc/src/docbook/userdoc/import_export_data.xml

@@ -76 +76 @@
   <para>
     When a plug-in that supports import or export of a certain type of item
-    an <guibutton>Import</guibutton> or <guibutton>Export</guibutton>
+    an &gbImport; or &gbExport;
     button is displayed in the toolbar on either the list view or the single-item
     view.
@@ -147 +147 @@
       <title>Select plug-in and file format</title>
       <para>
-        Click on the <guibutton>Import</guibutton> button
+        Click on the &gbImport; button
         in the toolbar to start the import wizard. The first step is to
         select which plug-in and, if supported, which 
@@ -219 +219 @@
         <para>
           Proceed to the next step by clicking on the
-          <guibutton>Next</guibutton> button.
+          &gbNext; button.
         </para>
 
@@ -251 +251 @@
           Select the auto detect option either for both plug-ins and 
           file formats or only for file formats to use this feature. 
-          Continue to the next step by clicking on the <guibutton>Next</guibutton>
+          Continue to the next step by clicking on the &gbNext;
           button.
         </para>
@@ -305 +305 @@
           
           <para>
-            Click on the <guibutton>Next</guibutton> button
+            Click on the &gbNext; button
             to start the auto detection.
           </para>
@@ -392 +392 @@
       <para>
         Continue to the next step by clicking the 
-        <guibutton>Next</guibutton> button.
+        &gbNext; button.
       </para>
       
@@ -414 +414 @@
       <para>
         Clicking on
-        <guibutton>Finish</guibutton>
+        &gbFinish;
         when everything is set will end the job configuration and place the job in the job queue. 
         A self-refreshing window appears with information about the
@@ -498 +498 @@
         <para>
           Click on
-          <guibutton>Next</guibutton>
+          &gbNext;
           to show the configuration of parameters for the job.
         </para>
@@ -540 +540 @@
       <para>
         Click on
-        <guibutton>Next</guibutton>
+        &gbNext;
         to proceed to next configuration window.
       </para>
@@ -578 +578 @@
         If you choose to save the file within the BASE file system, there will be a
         window where the job should get a name and optionally a description. By then clicking on
-        <guibutton>Finish</guibutton>
+        &gbFinish;
         the configuration process will end and the job will be put in the job queue. A
         self-refreshing window appears with information about the job's status and execution
@@ -609 +609 @@
     <para>
       Then select the <guilabel>Table exporter</guilabel> and click on
-      the <guibutton>Next</guibutton> button. The plug-in selection step is
+      the &gbNext; button. The plug-in selection step is
       only displayed if there is more than one export plug-in that can
       be used in the current context. Usually, the table exporter is the
@@ -730 +730 @@
       
       <para>
-        Click on <guibutton>Ok</guibutton>
+        Click on &gbOk;
         to proceed when all options have been set for the export.
       </para>

trunk/doc/src/docbook/userdoc/project_permission.xml

@@ -463 +463 @@
           <listitem>
             <para>
-            Click on the <guibutton>Edit&hellip;</guibutton>
+            Click on the &gbEdit;
             button to open the <guilabel>Edit project</guilabel>
             dialog.
@@ -551 +551 @@
                 Opens a popup window that allows you to add
                 users to the project. In the popup window, mark
-                one or more users and click on the <guibutton>Ok</guibutton>
+                one or more users and click on the &gbOk;
                 button. Unless you are an administrator, the popup window 
                 will only list users that are members of at least one of the 
@@ -566 +566 @@
                 Opens a popup window that allows you to add
                 groups to the project. In the popup window, mark
-                one or more groups and click on the <guibutton>Ok</guibutton>
+                one or more groups and click on the &gbOk;
                 button. Unless you are
                 an administrator, the popup window will only list groups 
@@ -576 +576 @@
             
             <varlistentry>
-              <term><guibutton>Remove</guibutton></term>
+              <term>&gbRemove;</term>
               <listitem>
                 <para>
@@ -588 +588 @@
           
           <para>
-            Use the <guibutton>Save</guibutton> button to save your
-            changes or the <guibutton>Cancel</guibutton> button to
+            Use the &gbSave; button to save your
+            changes or the &gbCancel; button to
             close the popup without saving.
           </para>
@@ -683 +683 @@
             <listitem>
               <para>
-                Click on the <guibutton>Share&hellip;</guibutton> button
+                Click on the &gbShare; button
                 and share the items to the new project.
               </para>

trunk/doc/src/docbook/userdoc/rawbioassays.xml

@@ -346 +346 @@
       Click on the <guibutton>Create</guibutton> button
       to add the spot image creation job to the job queue,
-      or on <guibutton>Cancel</guibutton> to abort.
+      or on &gbCancel; to abort.
     </para>
     

trunk/doc/src/docbook/userdoc/reporters.xml

@@ -51 +51 @@
     </menuchoice>
    </para>
-   <para> Click on <guibutton>New&hellip;</guibutton>. </para>
+   <para> Click on &gbNew;. </para>
    <para>A 'Create' pop-up window opens and allow to fill in <guilabel>Name</guilabel> and
      <guilabel>Description</guilabel>
@@ -81 +81 @@
     </menuchoice>
    </para>
-   <para>Click on <guibutton>New&hellip;</guibutton>. </para>
+   <para>Click on &gbNew;. </para>
    <para> A 'Create' pop-up window opens, it contains 2 tabs: <guilabel>Reporter</guilabel> and
      <guilabel>Extended properties</guilabel>. </para>
@@ -152 +152 @@
     <listitem>
      <para> Alternately, navigating to the Reporter Item View, one can hit the
-       <guibutton>Edit&hellip;</guibutton> to performed the task.</para>
+       &gbEdit; to performed the task.</para>
      <para>In both cases, an Edit pop-up windows opens. It is essentially identical to a Create
       window and allows updating information about a particular ArraySlide item stored in BASE2</para>
@@ -184 +184 @@
    <important>
     <para> This specific handling of Reporters means that deletion events are unrecoverable.
-     Therefore, pressing the <guibutton>Delete</guibutton> button will always prompt for a
+     Therefore, pressing the &gbDelete; button will always prompt for a
      confirmation message as illustrated below. </para>
 
@@ -198 +198 @@
     </figure>
    </important>
-   <para> Select one or more reporters and click <guibutton>Delete</guibutton> button in the menu
+   <para> Select one or more reporters and click &gbDelete; button in the menu
     bar. </para>
   </sect2>
@@ -264 +264 @@
       </menuchoice>
      </para>
-     <para> Click on <guibutton>New&hellip;</guibutton> button from the ReporterList ListView </para>
+     <para> Click on &gbNew; button from the ReporterList ListView </para>
      <para> A 'Create' pop-up window opens allowing to fill-in Name and a short text description of
       the newly created Reporter list </para>

trunk/doc/src/docbook/userdoc/trashcan.xml

@@ -82 +82 @@
       To delete one or several items permanently from trashcan you first have to select them,
       click then on the
-      <guibutton>Delete</guibutton>
+      &gbDelete;
       button. Press then on either
-      <guibutton>Ok</guibutton>
+      &gbOk;
       (completes the deletion) or
-      <guibutton>Cancel</guibutton>
+      &gbCancel;
       (no items will be deleted) in the dialog window that appears.
     </para>

trunk/doc/src/docbook/userdoc/webclient.xml

@@ -448 +448 @@
           
           <para>
-            Press <guibutton>Save</guibutton> to save the changes or 
-            <guibutton>Cancel</guibutton> to abort.
+            Press &gbSave; to save the changes or 
+            &gbCancel; to abort.
           </para>
           
@@ -813 +813 @@
           to create a new experiment go to the 
           <menuchoice><guimenu>View</guimenu> <guimenuitem>Experiments</guimenuitem></menuchoice>
-          page. Here you will find a <guibutton>New&hellip;</guibutton> button in the
+          page. Here you will find a &gbNew; button in the
           toolbar. The button is disabled if you don't have permission to create new experiments. 
           Otherwise, click on it and enter any required information in the popup dialog.
@@ -834 +834 @@
         
         <para>
-          Click on the <guibutton>Save</guibutton> button to save the new
-          item to the database or on the <guibutton>Cancel</guibutton> button
+          Click on the &gbSave; button to save the new
+          item to the database or on the &gbCancel; button
           to abort.
         </para>
@@ -890 +890 @@
         
         <para>
-          On all single-item views there is an <guibutton>Edit&hellip;</guibutton>
+          On all single-item views there is an &gbEdit;
           button in the toolbar that opens a popup dialog for editing the properties
           of the item. This button is disabled if the logged in user doesn't have
@@ -908 +908 @@
 
         <para>
-          Click on the <guibutton>Save</guibutton> button to save the changes
-          to the database or on the <guibutton>Cancel</guibutton> button
+          Click on the &gbSave; button to save the changes
+          to the database or on the &gbCancel; button
           to abort.
         </para>
@@ -937 +937 @@
           To delete items from the list view you must first mark
           the checkbox for each item you want to delete. Then, click on 
-          the <guibutton>Delete</guibutton> button. The list should refresh itself
+          the &gbDelete; button. The list should refresh itself
           automatically. If you want to confirm that the items have been removed
           use the <guilabel>view / presets</guilabel> dropdown and select
@@ -947 +947 @@
         <para>
           To delete items from the single-item view, click on the 
-          <guibutton>Delete</guibutton> button in the toolbar. The page will refresh
+          &gbDelete; button in the toolbar. The page will refresh
           itself automatically and a small trashcan icon should be displayed.
           If you don't have permission to delete the item the delete button
@@ -971 +971 @@
           displayed in the list with a small trashcan icon to indicate that
           they are located in the trashcan. Then, mark the checkbox for each item that you want
-          to restore and click the <guibutton>Restore</guibutton> button. The list should 
+          to restore and click the &gbRestore; button. The list should 
           refresh itself automatically and the trashcan icon should be gone from the
           restored items.
@@ -978 +978 @@
         <para>
           To restore items from the single-item view, click on the 
-          <guibutton>Restore</guibutton> button in the toolbar. The page will refresh
+          &gbRestore; button in the toolbar. The page will refresh
           itself automatically and the small trashcan icon should be gone.
           If you don't have permission to restore the item the restore button
@@ -1005 +1005 @@
         <para>
           From a list view, mark the checkbox for each item you want to share.
-          Then, click on the <guibutton>Share&hellip;</guibutton> button.
-          If you are on a single-item page, click on the <guibutton>Share&hellip;</guibutton> 
+          Then, click on the &gbShare; button.
+          If you are on a single-item page, click on the &gbShare; 
           button on that page. In both cases, this will open the 
           <guilabel>Set access permissions</guilabel>
@@ -1075 +1075 @@
                 Opens a popup window that allows you to select
                 users to share the items to. In the popup window, mark
-                one or more users and click on the <guibutton>Ok</guibutton>
+                one or more users and click on the &gbOk;
                 button. Unless you are an administrator, the popup window 
                 will only list users that are members of at least one of the 
@@ -1090 +1090 @@
                 Opens a popup window that allows you to select
                 groups to share the items to. In the popup window, mark
-                one or more groups and click on the <guibutton>Ok</guibutton>
+                one or more groups and click on the &gbOk;
                 button. Unless you are an administrator, the popup window 
                 will only list groups where you are a member. It will not list
@@ -1104 +1104 @@
                 Opens a popup window that allows you to select
                 projects to share the items to. In the popup window, mark
-                one or more projects and click on the <guibutton>Ok</guibutton>
+                one or more projects and click on the &gbOk;
                 button. Unless you are an administrator, the popup window 
                 will only list projects where you are a member. It will not list
@@ -1113 +1113 @@
 
             <varlistentry>
-              <term><guibutton>Remove</guibutton></term>
+              <term>&gbRemove;</term>
               <listitem>
                 <para>
@@ -1124 +1124 @@
         
           <para>
-            Use the <guibutton>Save</guibutton> button to save your
-            changes or the <guibutton>Cancel</guibutton> button to
+            Use the &gbSave; button to save your
+            changes or the &gbCancel; button to
             close the popup without saving.
           </para>
@@ -1149 +1149 @@
           the items, and click in the <guibutton>Take ownership</guibutton>
           button. A warning message about not being able to undo the action
-          is displayed. Click on <guibutton>Ok</guibutton> to continue or
-          <guibutton>Cancel</guibutton> to abort.
+          is displayed. Click on &gbOk; to continue or
+          &gbCancel; to abort.
         </para>
         
@@ -1264 +1264 @@
             <para>
             A toolbar with buttons for various actions such as
-            <guibutton>New&hellip;</guibutton> for creating a new item, 
-            <guibutton>Delete</guibutton> for deleting items and 
+            &gbNew; for creating a new item, 
+            &gbDelete; for deleting items and 
             <guibutton>Columns&hellip;</guibutton> for configuring columns.
             Depending on the permissions of the logged in user
@@ -1479 +1479 @@
         
           <para>
-            Use the <guibutton>Save</guibutton> button to apply your
-            changes or the <guibutton>Cancel</guibutton> button to
+            Use the &gbSave; button to apply your
+            changes or the &gbCancel; button to
             close the popup without saving.
           </para>
@@ -1673 +1673 @@
           
           <para>
-            Use the <guibutton>Ok</guibutton> button to save the preset
-            or the <guibutton>Cancel</guibutton> button to
+            Use the &gbOk; button to save the preset
+            or the &gbCancel; button to
             close the popup without saving.
           </para>
@@ -1713 +1713 @@
             a warning about that the action can't be undone. Unlike other
             items, the presets are not moved to the trashcan. Click on
-            <guibutton>Ok</guibutton> to delete the preset.
+            &gbOk; to delete the preset.
           </para>
           
@@ -1732 +1732 @@
           
           <para>
-            Use the <guibutton>Close</guibutton> button to
+            Use the &gbClose; button to
             close the popup.
           </para>

trunk/lib/docbook/preprocess/dweiss-docbook-extensions.dtd

@@ -58 +58 @@
 <!ATTLIST appendix chunked (0|1) "0" >
 
+<!--Start tag and end tag for guibutton -->
+<!ENTITY % gbStart  "<guibutton>">
+<!ENTITY % gbEnd  "</guibutton>">
+<!-- Most used buttons in BASE2 -->
+<!ENTITY gbBrowse     "%gbStart;Browse%gbEnd;">
+<!ENTITY gbCancel     "%gbStart;Cancel%gbEnd;">
+<!ENTITY gbClose      "%gbStart;Close%gbEnd;">
+<!ENTITY gbDelete     "%gbStart;Delete%gbEnd;">
+<!ENTITY gbExport     "%gbStart;Export%gbEnd;">
+<!ENTITY gbEdit       "%gbStart;Edit&hellip;%gbEnd;">
+<!ENTITY gbFinish     "%gbStart;Finish%gbEnd;">
+<!ENTITY gbImport     "%gbStart;Import%gbEnd;">
+<!ENTITY gbNew        "%gbStart;New&hellip;%gbEnd;">
+<!ENTITY gbNext       "%gbStart;Next%gbEnd;">
+<!ENTITY gbOk       "%gbStart;Ok%gbEnd;">
+<!ENTITY gbPool       "%gbStart;Pool&hellip;%gbEnd;">
+<!ENTITY gbPredefined   "%gbStart;Predefined%gbEnd;">
+<!ENTITY gbRemove     "%gbStart;Remove%gbEnd;">
+<!ENTITY gbRestore      "%gbStart;Restore%gbEnd;">
+<!ENTITY gbSave       "%gbStart;Save%gbEnd;">
+<!ENTITY gbShare      "%gbStart;Share&hellip;%gbEnd;">