Project

General

Profile

Revision 6124

Added by Chris Jones over 9 years ago

Merged in the D1_0_6_2_BRANCH changes that include the transition from ObjectFormat calls to ObjectFormatCache calls.

View differences:

test/edu/ucsb/nceas/metacat/dataone/MetadataTypeRegisterTest.java
28 28
import junit.framework.Test;
29 29
import junit.framework.TestSuite;
30 30

  
31
import org.dataone.client.ObjectFormatCache;
32
import org.dataone.service.exceptions.NotFound;
31 33
import org.dataone.service.types.*;
32 34

  
33 35
/**
......
76 78
     */
77 79
    public void testIsMetadataType()
78 80
    {
79
        ObjectFormat of = ObjectFormat.convert("XXXX");
81
      ObjectFormat of = null;
82
      try {
83
	        of = ObjectFormatCache.getFormat("XXXX");
84
              
85
      } catch (NotFound e) {
80 86
        assertFalse(MetadataTypeRegister.isMetadataType(of));
81
        
82
        of = ObjectFormat.convert("eml://ecoinformatics.org/eml-2.0.0");
83
        assertTrue(MetadataTypeRegister.isMetadataType(of));
84
        
85
        of = ObjectFormat.convert("http://www.unidata.ucar.edu/namespaces/netcdf/ncml-2.2");
86
        assertTrue(MetadataTypeRegister.isMetadataType(of));
87
        
88
        of = ObjectFormat.convert("CF-1.3");
89
        assertTrue(MetadataTypeRegister.isMetadataType(of));
90
        
91
        of = ObjectFormat.convert("http://www.loc.gov/METS/");
92
        assertTrue(MetadataTypeRegister.isMetadataType(of));
93
        
94
        of = ObjectFormat.convert("eml://ecoinformatics.org/eml-3.0.0");
95
        assertFalse(MetadataTypeRegister.isMetadataType(of));
87
      
88
      }
89
      
90
      try {
91
	      
92
      	of = ObjectFormatCache.getFormat("eml://ecoinformatics.org/eml-2.0.0");
93
	      assertTrue(MetadataTypeRegister.isMetadataType(of));
94
	      
95
	      of = ObjectFormatCache.getFormat("http://www.unidata.ucar.edu/namespaces/netcdf/ncml-2.2");
96
	      assertTrue(MetadataTypeRegister.isMetadataType(of));
97
	      
98
	      of = ObjectFormatCache.getFormat("CF-1.3");
99
	      assertTrue(MetadataTypeRegister.isMetadataType(of));
100
	      
101
	      of = ObjectFormatCache.getFormat("http://www.loc.gov/METS/");
102
	      assertTrue(MetadataTypeRegister.isMetadataType(of));
103
	      
104
	      of = ObjectFormatCache.getFormat("eml://ecoinformatics.org/eml-3.0.0");
105
	      assertFalse(MetadataTypeRegister.isMetadataType(of));
106
      
107
      } catch (NotFound e) {
108
      	e.printStackTrace();
109
      	
110
      }
111

  
96 112
    }
97 113
}
test/edu/ucsb/nceas/metacat/dataone/CNCoreTest.java
30 30
import junit.framework.Test;
31 31
import junit.framework.TestSuite;
32 32

  
33
import org.dataone.client.ObjectFormatCache;
33 34
import org.dataone.service.types.Checksum;
34 35
import org.dataone.service.types.ChecksumAlgorithm;
35 36
import org.dataone.service.types.Identifier;
......
125 126
	    SystemMetadata sm = new SystemMetadata();
126 127
        //set the id
127 128
        sm.setIdentifier(id);
128
        sm.setObjectFormat(ObjectFormat.OCTET_STREAM);
129
        sm.setObjectFormat(ObjectFormatCache.getFormat("application/octet-stream"));
129 130
        //create the checksum
130 131
        String checksumS = "test";
131 132
        ChecksumAlgorithm ca = ChecksumAlgorithm.convert("MD5");
test/edu/ucsb/nceas/metacat/dataone/CrudServiceTest.java
34 34
import junit.framework.TestSuite;
35 35

  
36 36
import org.apache.commons.io.IOUtils;
37
import org.dataone.client.ObjectFormatCache;
37 38
import org.dataone.service.exceptions.BaseException;
38 39
import org.dataone.service.types.AuthToken;
39 40
import org.dataone.service.types.Checksum;
......
131 132
            //create the system metadata then run the create method
132 133
            StringBufferInputStream sbis = new StringBufferInputStream(testDoc);
133 134
            SystemMetadata sm = createSystemMetadata(id, testDoc, 
134
                    ObjectFormat.convert("eml://ecoinformatics.org/eml-2.1.0"));
135
                    ObjectFormatCache.getFormat("eml://ecoinformatics.org/eml-2.1.0"));
135 136
            //create the doc
136 137
            Identifier rGuid = cs.create(token, id, sbis, sm);
137 138
            
......
291 292
	            id.setValue(docid);
292 293
	            String testDoc = getTestDoc();
293 294
	            StringBufferInputStream sbis = new StringBufferInputStream(testDoc);
294
	            ObjectFormat of1 = ObjectFormat.convert("eml://ecoinformatics.org/eml-2.1.0");
295
	            ObjectFormat of1 = ObjectFormatCache.getFormat("eml://ecoinformatics.org/eml-2.1.0");
295 296
	            SystemMetadata sm = createSystemMetadata(id, testDoc, of1);
296 297
	            assertFalse(sm.getChecksum().getValue().startsWith("MD5"));
297 298
	            //create the doc
......
310 311
            id.setValue(docid);
311 312
            String testDoc = getTestDoc();
312 313
            StringBufferInputStream sbis = new StringBufferInputStream(testDoc);
313
            ObjectFormat of1 = ObjectFormat.convert("eml://ecoinformatics.org/eml-2.1.0");
314
            ObjectFormat of1 = ObjectFormatCache.getFormat("eml://ecoinformatics.org/eml-2.1.0");
314 315
            SystemMetadata sm = createSystemMetadata(id, testDoc, of1);
315 316
            assertFalse(sm.getChecksum().getValue().startsWith("MD5"));
316 317
            //create the doc
......
358 359
	        Date d1 = new Date(new Date().getTime() - 5000);
359 360
	        CrudService cs = CrudService.getInstance();
360 361
	        AuthToken token = getToken();
361
	        ObjectFormat of1 = ObjectFormat.convert("eml://ecoinformatics.org/eml-2.1.0");
362
	        ObjectFormat of1 = ObjectFormatCache.getFormat("eml://ecoinformatics.org/eml-2.1.0");
362 363
	        //create docs at different times
363 364

  
364 365
	        Identifier id = new Identifier();
......
479 480
	    {
480 481
	        CrudService cs = CrudService.getInstance();
481 482
	        AuthToken token = getToken();
482
	        ObjectFormat of1 = ObjectFormat.convert("eml://ecoinformatics.org/eml-2.1.0");
483
	        ObjectFormat of2 = ObjectFormat.convert("eml://ecoinformatics.org/eml-2.0.0");
483
	        ObjectFormat of1 = ObjectFormatCache.getFormat("eml://ecoinformatics.org/eml-2.1.0");
484
	        ObjectFormat of2 = ObjectFormatCache.getFormat("eml://ecoinformatics.org/eml-2.0.0");
484 485
	        //create docs at different times
485 486
	        Date d1 = new Date();
486 487
	        Identifier id1 = createDoc(token, getTestDoc(EML2_1_0), of1);
......
820 821
	 */
821 822
	public Identifier createDoc(AuthToken token, String testDoc) throws Exception
822 823
	{
823
	    return createDoc(token, testDoc, ObjectFormat.convert("eml://ecoinformatics.org/eml-2.1.0"));
824
	    return createDoc(token, testDoc, ObjectFormatCache.getFormat("eml://ecoinformatics.org/eml-2.1.0"));
824 825
	}
825 826
	
826 827
	/**
......
851 852
	  throws Exception
852 853
	{
853 854
	    return createSystemMetadata(id, testDoc, 
854
	            ObjectFormat.convert("eml://ecoinformatics.org/eml-2.1.0"));
855
	            ObjectFormatCache.getFormat("eml://ecoinformatics.org/eml-2.1.0"));
855 856
	}
856 857
	
857 858
	/**
lib/style/common/eml_xsl.css
1
 /*
2
  *   '$RCSfile: default.css,v $'
3
  *     Purpose: Default style sheet for KNB project web pages 
4
  *              Using this stylesheet rather than placing styles directly in 
5
  *              the KNB web documents allows us to globally change the 
6
  *              formatting styles of the entire site in one easy place.
7
  *   Copyright: 2000 Regents of the University of California and the
8
  *               National Center for Ecological Analysis and Synthesis
9
  *     Authors: Matt Jones
10
  *
11
  *    '$Author: jones $'
12
  *      '$Date: 2009-03-05 18:56:15 $'
13
  *  '$Revision: 1.32 $'
14
  *
15
  * This program is free software; you can redistribute it and/or modify
16
  * it under the terms of the GNU General Public License as published by
17
  * the Free Software Foundation; either version 2 of the License, or
18
  * (at your option) any later version.
19
  *
20
  * This program is distributed in the hope that it will be useful,
21
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
22
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
23
  * GNU General Public License for more details.
24
  *
25
  * You should have received a copy of the GNU General Public License
26
  * along with this program; if not, write to the Free Software
27
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
28
  */
1
/*   '$RCSfile: pisco.css,v $'                                              */
2
/*     Purpose: Default style sheet for PISCO project web pages             */
3
/*              Using this stylesheet rather than placing styles directly   */
4
/*              into PISCO web documents allows us to globally change the   */
5
/*              formatting styles of the entire site in one easy place.     */
6
/*              Versioning information for this document can be found at    */
7
/*              cvs.piscoweb.org.                                           */
8
/*   Copyright: 2000 Regents of the University of California and the        */
9
/*              Partnership for Interdisciplinary Studies of Coastal Oceans */
10
/*     Authors: Chris Jones, James Woods                                    */
11
/*                                                                          */
12
/*    '$Author: leinfelder $'                                                   */
13
/*      '$Date: 2011-01-13 15:01:00 -0800 (Thu, 13 Jan 2011) $'                                      */
14
/*  '$Revision: 5804 $'                                                      */
15
/*                                                                          */
29 16

  
30 17

  
31
  
32
/******************************************************************************/  
33
/******************************************************************************/  
34
/**  COMMON : USED BY EML STYLESHEETS AND OTHER PAGES                        **/
35
/******************************************************************************/  
36
/******************************************************************************/  
18
/* Color Scheme:
19
 *    dark blue:                  #003366
20
 *    aqua blue:                  #0066CC
21
 *    aqua green:                 #006666
22
 *    white:                      #FFFFFF
23
 *    dark tan(kelp color):       #666600
24
 *    light tan:                  #CCCC99
25
 */
37 26

  
38
/*** styles that override html tags ***/
39 27

  
28
/*
29
*  import eml css:
30
*/
31

  
40 32
body {
41
    padding: 0px;
42
    margin: 10px;
43
    color: #333333; 
44
    background-color: #ffffff;
45
    font-weight: normal;
46
    font-size: 12px; 
47
    font-family: Verdana,Arial,Helvetica,sans-serif; 
48
}
33
    width:                   100%;
34
    min-width:			800px;
35
    /* width:expression(document.body.clientWidth < 800? "800px": "auto");  */ /* hack for ie min width */
49 36

  
50
a {
51
    color: #669933;
52
    font-weight: bold;
53
    font-size: 12px; 
54
    text-decoration: none; 
55
    text-align: left;
56
}
37
    margin:                     0px 0px 0px 0px;
38
    background-color:           #ffffff;
39
    padding:                    0px;
40
    border:                     0px;
41
/*  background-image:           url('images/bg.gif');
42
/*  background-position:        top left;     /* No NN4 */
43
/*  background-repeat:          repeat-y;     /* No NN4 */
57 44

  
58
a:hover {
59
    color: #ff9933;
60
    text-decoration: underline; 
45
    font-style:                 normal;
46
    font-weight:                normal;
47
    font-size:                  100%;
48
    font-family:                "Myriad Pro", "Myriad Web Pro", "Myriad Web", "Myriad", Verdana, Arial, Helvetica, sans-serif;
49
    text-decoration:            none;
50
  }
51

  
52
body>div img {
53
    padding:                    0px 0px 0px 0px;
54
    }
55

  
56

  
57
#content_wrapper {
58
	margin:                     0px 10px 10px 10px;
61 59
}
62 60

  
63
h1 {
64
  font-size: 24px;
65
  font-family: Georgia, Times New Roman, Times, serif;
66
  text-align: center;
61

  
62
#header {
63
  width:                        100%;
64
  min-width:			800px; 
65
  width:expression(document.documentElement.clientWidth < 800? "800px": "auto");   /* hack for ie min width */
66
   /* position:                   absolute;  
67
    top:                        0px;
68
    left:                       10px; 
69
    right:                      10px; */
70
/*  margin:                     0px 10px 0px 10px; /* T R B L */
71
    padding:                    0px;
72
    border:                     0px;
73
    background-color:           #ffffff;
74
/*  background-image:           url('images/data_catalog_header_bg.jpg'); */
75

  
76
    height:                     60px; /* begin hack for ie5win */
77
    width:                      100%;
78
    voice-family:               "\"}\"";
79
    voice-family:               inherit;
80
    height:                     60px;
81
    }
82

  
83
html>body #header {
84
    height:                     60px; 
85
    width:                      auto;
86
    min-width:                  800px; /* end hack for ie5win */
87
    }
88

  
89

  
90
/* div "content" should be sibling to div "header" */ 
91
/* top margin required to clear sibling (logo is 100px tall)*/
92

  
93
#content {
94
    margin:                     0px 0px 0px 0px ; 
95
    background-color:           #ffffff;
96
    border:                     0px;
97
    /* margin:                     0px 0px 0px 0px;
98
 */
99
    }
100

  
101

  
102

  
103
/* these elements positioned to be in header below */
104

  
105
#left_logo {
106
    position:                   absolute;
107
    top:                        5px;
108
    z-index:                    2;  /* stack on top of header menu */
109
    left:                       10px; /* we want the logo on the left */
110
    margin:                     0px 0px 0px 0px; /* T R B L */
111
    padding:                    0px;
112
    border:                     0px;
113
    background-image:           url('images/sbclter-logo.gif');
114
    background-position:        top left;     /* No NN4 */
115
    background-repeat:          no-repeat;         /* No NN4 */
116
    width:                      99px; /* begin hack for 1e5win */
117
    height:                     100px; 
118
    voice-family:               "\"}\"";
119
    voice-family:               inherit;
120
    width:                      99px;
121
    height:                     100px;
122
    }
123

  
124
html>body #left_logo {
125
    width:                      99px;
126
    height:                     100px; /* end hack for ie5win */
127
    }
128

  
129
#right_logo {
130
    position:                   absolute;
131
    top:                        0px;
132
    right:                      10px; /* we want the logo near the right */
133
    margin:                     0px 0px 0px 0px; /* T R B L */
134
    padding:                    0px;
135
    border:                     0px;
136
    background-image:           url('images/sbclter-coastal-header.jpg');
137
    background-position:        top right;     /* No NN4 */
138
    background-repeat:          no-repeat;         /* No NN4 */
139
    height:                     60px; /* begin hack for 1e5win */
140
    width:                      223px;
141
    voice-family:               "\"}\"";
142
    voice-family:               inherit;
143
    height:                     60px;
144
    width:                      223px;
145
    }
146

  
147
html>body #right_logo {
148
    width:                      223px;
149
    height:                     60px; /* end hack for ie5win */
150
    }
151

  
152
/* banner holds the title and subtitle */
153
#banner {
154
    margin:                     0px 0px 0px 110px; /* T R B L */
155
    padding:                    0px;
156
    border:                     0px;
157
    background-color:           #ffffff;
158
/*  background-image:           url('images/data_catalog_header_search.jpg') */
159
    background-position:        top left;     /* No NN4 */
160
    background-repeat:          no-repeat;         /* No NN4 */
161
/*  height:                     60px; /* begin hack for ie5win */
162
    voice-family:               "\"}\"";
163
    voice-family:               inherit;
164
/*  height:                     60px;
165
 */
166
    }
167

  
168
html>body #banner {
169
/*  height:                     60px; /* end hack for ie5win */
170
    }
171

  
172

  
173

  
174
/* Header Sub-Title Classes
175
 * title and subtitle in the left portion of the banner */
176

  
177
div.header-title {
178
    position:           absolute;
179
    top:                5px;
180
    left:               110px;
181
    color:              #003366;
182
/*  padding:            1px 4px 1px 100px;
183
 */
184
    font-size:          26px;
185
    font-family:        serif;
186
    font-style:         normal;
187
    font-weight:        800;
67 188
}
68 189

  
69
h2 {
70
  font-size: 20px;
71
  font-family: Georgia, Times New Roman, Times, serif;
190

  
191
div.header-subtitle {
192
    position:           absolute;
193
    top:                40px;
194
    left:               115px;
195
    color:              #006666;
196
/*  padding:            1px 4px 1px 110px; */
197
    font-size:          12px;
72 198
}
73 199

  
74
h3 {
75
  font-size: 16px;
76
  font-family: Georgia, Times New Roman, Times, serif;
77
  text-align: center;
200
div.header-menu {
201
    position:           absolute;
202
    top:                60px;
203
    width:              100%;
204
    z-index:            1;       /* put menu underneath logos */
205
    border-top:         1px solid #006666;
206
    border-bottom:      1px solid #006666;                    
207
    color:              #666600;                                  
208
    background-color:   #CCCC99;                                  
209
    padding:            2px 2px 2px 110px;                        
210
    font-size:          14px;                                     
211
}                                                                 
212

  
213

  
214

  
215

  
216
/* header doesnt currently accomodate this class  */
217
div.header-submenu {                                              
218
    color:              #003366;                                  
219
    background-color:   #FFFFFF;                                  
220
    padding:            2px 10px 2px 110px;                       
221
    font-size:          14px;                                     
222
}                                                                 
223
                                                                  
224

  
225

  
226

  
227
#left_sidebar {
228
    position:                   absolute;
229
    top:                        0px;
230
    left:                       0px;
231
    margin:                     0px;
232
    padding:                    0px;
233
    border:                     0px;
234
    background-color:           #003366;
235
    width:                      10px; /* begin hack for 1e5win */
236
    voice-family:               "\"}\"";
237
    voice-family:               inherit;
238
    width:                      10px;
239
    }
240

  
241
html>body #left_sidebar {
242
    width:                      10px; /* end hack for ie5win */
243
    }
244

  
245
#right_sidebar {
246
    position:                   absolute;
247
    top:                        0px;
248
    right:                      0px;
249
    margin:                     0px;
250
    padding:                    0px;
251
    border:                     0px;
252
    background-color:           #003366;
253
    width:                      10px; /* begin hack for 1e5win */
254
    voice-family:               "\"}\"";
255
    voice-family:               inherit;
256
    width:                      10px;
257
    }
258

  
259
html>body #right_sidebar {
260
    width:                      10px; /* end hack for ie5win */
261
    }
262

  
263

  
264

  
265

  
266

  
267

  
268

  
269

  
270

  
271

  
272

  
273

  
274
/* these classes to be children of div "content" */
275

  
276

  
277
/* for the skip-to box */
278

  
279
 div.skipto-box {
280
      vertical-align:	  middle;
281
      text-align:         center;
282
      color:              #003366;
283
      background-color:   #CCCC99;
284
      /* turned off float, placed with a table cell */
285
      /*float:              left; */
286
      padding:            6px;
287
      /* set border for NN4 only change in advanced.css */
288
      border:             0.1px solid #006666;
289
      margin:             8px;
290
      /* width: 		  50%; */
291
      width:              300px; 
292
     /* height:             20px; */
293
      font-size:          12px;
78 294
  }
79 295

  
80
td {
81
    font-size: 12px; 
82
    line-height: 1.5;
83
}
296
div.r-box {
297
      vertical-align:     middle;
298
      text-align:         center;
299
      color:              #003366;
300
      background-color:   #CCCC99;
301
      float:              right;
302
      padding:            6px 6px;
303
      /* set border for NN4 only change in advanced.css */
304
      border:             0.1px solid #006666;
305
      margin:             0px;
306
      width:              50%;
307
   /*   height:             auto; */
308
      font-size:          12px;
309
   /*   clear:              both; */
310
  }
84 311

  
85
p { 
86
    margin: 5px; 
87
}
88 312

  
89
p + p { 
90
    margin: 5px; 
91
    text-indent: 2em; 
92
}
313
div.content-area {
314
       /* for padding area within parent area */
315
    background-color:   #FFFFFF;
316
    color:              #003366;
317
    text-align:         left;
318
   padding:            30px 40px 15px 40px; 
319
   /*padding:            0px 0px 0px 0px; */
93 320

  
94
p.label { 
95
    color: #333333; 
96
    font-weight: bold; 
97 321
}
98 322

  
99
p.contact { 
100
    color: #333333; 
101
    padding: 1em;
102
    font-size: 0.75em; 
103
    font-weight: normal;
104
    font-style: italic; 
323
div.content-area-dense {
324
       /* for padding area within parent area */
325
    background-color:   #FFFFFF;
326
    color:              #003366;
327
    text-align:         left;
328
  /*  padding:            30px 40px 15px 40px; */
329
   padding:            0px 0px 0px 0px; 
330

  
105 331
}
106 332

  
107 333

  
108
/*** custom styles ***/
109 334

  
110
#mainTableAligmentStyle {
111
    width: 100%;
112
}
335
div.hanging-paragraph {
336
	margin-left:	20px;
337
	text-indent:	-20px;
113 338

  
114
.mainContainerTableStyle {
115
    width: 100%;
116 339
}
117 340

  
118
.title {
119
    font-family: Georgia, Times New Roman, Times, serif;
120
    color:  #0247A8;
121
    font-size: 24px; 
122
    font-weight: bold;
341
div.smaller-font {
342
    	font-size:		smaller;
123 343
}
124 344

  
125
.subtitle {
126
    font-family: Verdana,Arial,Helvetica,sans-serif;
127
    font-size: 12px;
128
    font-weight: bold;
129
    color: #666666; 
130
    margin-left: 3em;
131
    margin-top: 0.5em;
132
    margin-bottom: 2em;
133
    font-weight: normal;  
345
div.bottom-padding {
346
/*	padding:		0px 0px 10px 0px; */
347
	padding-bottom:		10px;
134 348
}
135 349

  
136
.sectiontitle {
137
    font-family: Verdana,Arial,Helvetica,sans-serif;
138
    font-size: 12px;
139
    font-weight: bold;
140
    color: #666666;
141
    margin-top: 1em;
142
	margin-bottom: 0.25em;						
350
div.left-padding {
351
	padding-left:		10px;
143 352
}
144 353

  
145
.tabledefault {
146
    background: white;
147
    color: #555555;
148
    width: 100%; 
149
    font-size: 12px; 
150
    line-height: 1.2;
151
    left-padding: 5px;
152
    right-padding: 5px; 
153
}
354
#search-box { 
355
  /* background and text style set by table .group */
356
  position:           relative;
357
  margin-left:        50%;
358
  /* top: 110px; */
359
 }
154 360

  
155
.tablehead {
156
    background-color: #B3D4FF;
157
    color: #0040A1; 
158
    font-size: 14px; 
159
    font-weight: bold; 
160
    border-top: solid #ffffff 5px;
161
    border-bottom: solid #ffffff 2px;
162
    padding-left: 15%;
163
    padding-top: 0px;
164
    padding-bottom: 0px;
165
}
166 361

  
167
.roweven {
168
    background: white; 
169
}
362
#search-box_right {
363
    text-align:     right;
364
    }
170 365

  
171
.rowodd {
172
    background: white; 
173
}
366
#loginbox {
367
    border:                     0px;
368
    position:                   absolute;
369
    top:                        55px;
370
    right:                      65px;
371
    }
372

  
373
#footer {
374
    position:                   absolute;
375
    right:                      10px;
376
    bottom:                     0;
377
    left:                       167px;
378
    margin:                     0px 10px 10px 177px;
379
    }
380

  
381
#debug {
382
    position:                   absolute;
383
    right:                      20px;
384
    bottom:                     0;
385
    left:                       167px;
386
    margin:                     0px 10px 10px 177px;
387
    }
388

  
389
p,ul,ol,dl,li,dt {
390
    color:                      #555555;
391
    font-style:                 normal;
392
    font-weight:                normal;
393
    text-decoration:            none;
394
  }
174 395
  
175
.emphasis { 
176
    color: red; 
177
}
396
p ol,p ul, p dl, ol ul {
397
    color:                      #555555;
398
    font-style:                 normal;
399
    font-weight:                normal;
400
    text-decoration:            none; 
401
  } 
178 402

  
179
    
180
/******************************************************************************/  
181
/******************************************************************************/  
182
/**  USED BY EML STYLESHEETS ONLY - NO OTHERS                                **/
183
/******************************************************************************/  
184
/******************************************************************************/  
403
ul,ol {
404
    padding:                    0px;
405
    /* margin:                     0px 0px 0px 15px; */
406
    }
185 407

  
186
.mainContainerTable {
187
    width: 750px;
188
    background-color: #ffffff; 
189
    font-size: 12px;
190
}
191 408

  
192
.linkedHeaderStyle {
193
    background: #B2D2FE;
194
    border-top: solid #ffffff 5px;
195
    padding-left: 15%;
196
    text-align: left;
197
    font-weight: bold; 
198
}
199 409

  
200
.highlight  {
201
    background-color: #dddddd; 
202
    font-size: 12px;
203
    border: solid #ffffff 1px;
204
    padding-right: 4px;
205
    text-align: right;
206
    
207
}
410
.ol-lower-alpha { 
411
    list-style-type: lower-alpha;
412
    margin-top:       2px;
208 413

  
209
.highlightAttrib {
210
    background-color: #ffffff;
211
    font-size: 12px;
212
    text-align: center;
213
    border-bottom: solid #cccccc  2px;
214
    padding-left: 4px;
414
  }
215 415

  
216
}
217 416

  
218
.searchresultsdivider {
219
	background-color: #dddddd;
220
}
417
.ul-bulleted-list { 
418
    list-style-type:  disc;
419
    margin-top:       2px;
420
    margin-bottom:    10px;
421
    margin-left:      15px;
422
  }
221 423

  
424
/* add a little space before items in a list ?*/
425
/* ol li { margin-top : 5px; } */
426
/* ul li { margin-top : 5px; } */
222 427

  
223
.citation  {
224
    color: black;
225
    background-color: #FFFFFF;
226
    font-size: 1.2em; 
428

  
429

  
430

  
431
div {
432
    color:                      #003366;
433
    font-style:                 normal;
434
    font-weight:                normal;
435
    text-decoration:            none;
436
  }
437

  
438
  
439
/* NN 4.xx needs the font weight reset for b and strong tags */ 
440
strong, b {
441
    font-weight:                800;
442
  }
443

  
444
/* to emphasize words, use it inline with a <span> class*/ 
445
big {
446
    font-size:                  larger;
447
  }
448

  
449
/* to shrink words, use it inline with a <span> class*/
450
small {
451
    font-size:                  smaller;
452
  }
453
  
454
/* for pre-formated text: adds a small padding around it
455
 * font is set to the default style, 
456
 * but could be changed for different effect
457
 */
458
pre {
459
    color:                      #003366;
460
    padding:                    10px;
461
    font-style:                 normal;
462
    font-weight:                normal;
463
    text-decoration:            none;
464
  }
465
  
466
pre.inline {
467
    padding: 0px;
227 468
    padding-left: 10px;
469
    padding-right: 10px;
470
}  
471

  
472
/* for creating block quotes. 
473
 * set off with a slight indent to the left & right margins
474
 * font is set to default style,
475
 * but could be changed for different effect
476
 */
477
blockquote {
478
    color:                      #003366;
479
    padding:                    0;
480
    font-style:                 normal;
481
    font-weight:                normal;
482
    text-decoration:            none;
483
  }
484

  
485
/* Headings Tags : 
486
 * Headings are used to break up straight text. 
487
 * They are used to present topics, or subsections, chapters, etc.
488
 * There are 6 headings tag which can be styled as we wish.
489
 * All of our headings will be rendered in the same font and color as the
490
 * default settings.
491
 */  
492

  
493
/* h1: very large font, set bold */
494
h1 {
495
    color:                      #003366;
496
    background-color:           #ffffff;
497
    padding:                    0;
498
    font-size:                  18pt;
499
    font-style:                 normal;
500
    font-weight:                bold;
501
    text-decoration:            none;
502
  }
503

  
504
/* large font, set bold */
505
h2 {
506
    color:                      #003366;
507
    background-color:           #ffffff;
508
    padding:                    0;
509
    font-size:                  16pt;
510
    font-style:                 normal;
511
    font-weight:                bold;
512
    text-decoration:            none;
513
  }
514

  
515
/* slightly larger font, set bold */
516
h3 {
517
    color:                      #003366;
518
    background-color:           #ffffff;
519
    padding:                    0;
520
    font-size:                  14pt;
521
    font-style:                 normal;
522
    font-weight:                700;
523
    text-decoration:            none;
524
   /*  margin-bottom:                 0px; */
525
  }
526

  
527

  
528
/* an italic header w border */
529
/*
530
h3 {
531
  border-bottom:                #94c1d4 solid 1px;
532
  color:                        #003366;
533
  padding:                      0;
534
  font-size:                    14pt;
535
  margin:                       3px;
536
  text-align:                   left;
537
  font-style:                   italic;
538
  font-weight:                  200;
539
  }
540
*/
541

  
542

  
543

  
544
/* slightly larger, no bold */  
545
/* make margins around h4 all the same, and a little larger than h5 */
546
h4 {
547
    color:                      #003366;
548
    padding:                    0;
549
    font-size:                  12pt;
550
    font-style:                 normal;
551
    font-weight:                400;
552
    text-decoration:            none;
553
    margin-top:			10px;
554
    margin-bottom:                 0px;
555

  
556
  }
557

  
558
/* slightly smaller font */  
559
/* moz-net-fox and ie have different default margins for h5 - make them uniform */
560
h5 {
561
    color:                      #003366;
562
    padding:                    0;
563
    font-size:                  12pt;
564
    font-style:                 normal;
565
    font-weight:                400;
566
    text-decoration:            none;
567
    margin-bottom:                 0px; 
568
    margin-top:                 7px; 
569

  
570

  
571
  }
572

  
573
/* very small font */  
574
h6 {
575
    color:                      #003366;
576
    background-color:           #FFFFFF;
577
    padding:                    0;
578
    font-size:                  10pt;
579
    font-style:                 normal;
580
    font-weight:                normal;
581
    text-decoration:            none;
582
  }  
583

  
584

  
585

  
586
/* Old style hr command - will be depreciated
587
 * Netscape 4.x does not like this
588
 * should use new style below
589
 * used anywhere? remove?
590
 */
591
hr {
592
    border-top:                 #003366 0px solid;
593
    width:                      450px;
594
    height:                     2px;
595
    color:                      #003366;
596
    background-color:           #003366;
597
    /*border-width:               none;
... This diff was truncated because it exceeds the maximum size that can be displayed.

Also available in: Unified diff