Changeset 2493


Ignore:
Timestamp:
Aug 8, 2006, 1:13:19 PM (16 years ago)
Author:
dominic
Message:

gui changes and removal of default categories in install.java

Location:
branches/dominic_annotations
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • branches/dominic_annotations/src/core/net/sf/basedb/core/Install.java

    r2475 r2493  
    312312      // Annotations
    313313      createRoleKey(Item.ANNOTATIONTYPE, "Annotation types", "Gives access to annotation types", power_users_create);
    314       createRoleKey(Item.ANNOTATIONTYPECATEGORY, "Annotation types categories", "Gives access to annotation types categories", guests_use_power_users_all);
     314      createRoleKey(Item.ANNOTATIONTYPECATEGORY, "Annotation types categories", "Gives access to annotation types categories", power_users_create);
    315315     
    316316      // BioMaterials
     
    515515      createLabel("Biotin", "", rootUser, keyEveryoneUse);
    516516     
    517       //Annotation type categories
    518      
    519       if (progress != null) progress.display((int)(18*progress_factor), "--Creating annotation type categories...");
    520       AnnotationTypeCategoryData categoryGeneral = createAnnotationTypeCategory("General",
    521           "This category holds annotation types that have not been classified into established groups",
    522           rootUser,keyEveryoneUse );
    523          
    524517      // Annotation types
    525518      Item[] wells = new Item[] { Item.WELL };
    526519      Map<String, String> useRadio = Collections.singletonMap("displayAsList", "0");
    527       if (progress != null) progress.display((int)(19*progress_factor), "--Creating annotation types...");
     520      if (progress != null) progress.display((int)(18*progress_factor), "--Creating annotation types...");
    528521      createAnnotationType("Sequence verified", "", Type.STRING, 1, new String[] { "Not done", "Good", "Bad", "Failed" },
    529         wells, useRadio, false, rootUser, keyEveryoneUse,categoryGeneral );
     522        wells, useRadio, false, rootUser, keyEveryoneUse, null );
    530523      createAnnotationType("Bands", "", Type.STRING, 1, new String[] { "Not done", "Good", "Missing", "Multiple" },
    531524        wells, useRadio, false, rootUser, keyEveryoneUse, null );
     
    533526        wells, useRadio, false, rootUser, keyEveryoneUse, null );
    534527      createAnnotationType("Comment", "", Type.STRING, 1, null,
    535         wells, null, false, rootUser, keyEveryoneUse, categoryGeneral );
     528        wells, null, false, rootUser, keyEveryoneUse, null );
    536529
    537530      // Clients
    538       if (progress != null) progress.display((int)(20*progress_factor), "--Creating clients...");
     531      if (progress != null) progress.display((int)(19*progress_factor), "--Creating clients...");
    539532      createClient(rootUser, "net.sf.basedb.clients.test", "Test programs", "This client is used by test programs", keyEveryoneUse);
    540533      createClient(rootUser, "net.sf.basedb.clients.migration", "Migration tool", "This client is used to migrate BASE 1.2.x data to BASE 2", null);
    541534
    542535      // News
    543       if (progress != null) progress.display((int)(21*progress_factor), "--Creating news...");
     536      if (progress != null) progress.display((int)(20*progress_factor), "--Creating news...");
    544537      createNews("BASE 2 Server installed", "Welcome to your new BASE 2 server.");
    545538
    546539      // Plugins
    547       if (progress != null) progress.display((int)(22*progress_factor), "--Creating plugin definitions...");
     540      if (progress != null) progress.display((int)(21*progress_factor), "--Creating plugin definitions...");
    548541      createPluginType("Autodetecting importer", "This interface should be implemented by all plugins that are capable of autodetect the file format by parsing an input stream.",
    549542        "net.sf.basedb.core.plugin.AutoDetectingImporter", null);
     
    565558
    566559      // Formulas
    567       if (progress != null) progress.display((int)(23*progress_factor), "--Creating formulas...");
     560      if (progress != null) progress.display((int)(22*progress_factor), "--Creating formulas...");
    568561      createFormula(Formula.Type.COLUMN_EXPRESSION, Formula.Parser.JEP,
    569562        "Ratio, ch1 / ch2", "The ratio of channel 1 to channel 2", null, 2,
  • branches/dominic_annotations/www/admin/annotationtypecategories/view_category.jsp

    r2475 r2493  
    8888
    8989  <base:page title="<%=title%>">
    90   <base:head scripts="tabcontrol.js" styles="toolbar.css,headertabcontrol.css,path.css">
     90  <base:head scripts="tabcontrol.js" styles="toolbar.css,table.css,headertabcontrol.css,path.css">
    9191    <script language="JavaScript">
    9292    function editItem()
     
    233233        />
    234234        <tbl:columndef
    235           id="type"
    236           title="Type"
     235          id="valuetype"
     236          title="Value Type"
    237237        />
    238238        <tbl:columndef
    239239          id="description"
    240240          title="Description"
     241        />
     242        <tbl:columndef
     243          id="requiredForMiame"
     244          title="Required For Miame"
    241245        />
    242246       
     
    252256            <tbl:row>
    253257              <tbl:cell column="name"><%=Base.getEncodedName(annotationtype, false, annotationtypeLink)%></tbl:cell>
    254               <tbl:cell column="type">Annotation Types</tbl:cell>
     258              <tbl:cell column="valuetype"><%=annotationtype.getValueType()%></tbl:cell>
    255259              <tbl:cell column="description"><%=HTML.encodeTags(annotationtype.getDescription())%></tbl:cell>
     260              <tbl:cell column="requiredForMiame"><%=annotationtype.isRequiredForMiame() ? "yes" : "no"%></tbl:cell>
    256261            </tbl:row>
    257262            <%
  • branches/dominic_annotations/www/admin/annotationtypes/view_annotationtype.jsp

    r2475 r2493  
    8989
    9090  <base:page title="<%=title%>">
    91   <base:head scripts="tabcontrol.js" styles="toolbar.css,headertabcontrol.css,path.css">
     91  <base:head scripts="tabcontrol.js" styles="toolbar.css,table.css,headertabcontrol.css,path.css">
    9292    <script language="JavaScript">
    9393    function editItem()
Note: See TracChangeset for help on using the changeset viewer.