Project

General

Profile

« Previous | Next » 

Revision 5593

Added by ben leinfelder about 14 years ago

number of changes:
-list measurements across the screen under their observation
-use title attributes for full ontology class URI, only show full URI for the entity class since there is horizontal room
-make the annotation box more compact and intuitive for both screens (details and search results)

View differences:

lib/style/skins/semtools/annotation.xsl
59 59 
				<div id="content_wrapper">
60 60
61 61 
				<div class="group group_border">
62 
					<h3>Annotation Details</h3>
62 
					<h3>Semantic Annotation</h3>
63 63 
				</div>
64 64 
				<xsl:for-each select="/*[local-name()='annotation']">
65 65 
					<xsl:call-template name="annotation"/>
lib/style/skins/semtools/annotation-root.xsl
52 52 
				<td>
53 53 
					<table class="subGroup subGroup_border">
54 54 
						<tr>
55 
							<td class="text_plain">
56 
								<a>
55 
							<th colspan="2">
56 
								Annotation Details
57 
							</th>
58 
						</tr>
59 
						<tr>
60 
							<td class="rowodd">
61 
			     				ID
62 
			     			</td>
63 
			     			<td class="roweven">
64 
			     				<a>
57 65 
									<xsl:attribute name="href">
58 
										<xsl:value-of select="$tripleURI"/><xsl:value-of select="./@id"/></xsl:attribute>
59 
			     						<xsl:text>&#187;&#160;</xsl:text>Annotation
60 
			     				</a>
61 
			     			</td>
62 
			     			<td class="text_plain">
63 
								<pre class="inline"><xsl:value-of select="./@id"/></pre>
66 
										<xsl:value-of select="$tripleURI"/><xsl:value-of select="./@id"/>
67 
									</xsl:attribute>
68 
									<xsl:text>&#187;&#160;</xsl:text>
69 
									<xsl:value-of select="./@id"/>
70 
								</a>
64 71 
							</td>
65 72 
						</tr>
66 73 
						<tr>
67 
							<td class="text_plain">
68 
								<a>
74 
							<td class="rowodd">
75 
			     				Data Package
76 
			     			</td>
77 
			     			<td class="roweven">
78 
			     				<a>
69 79 
									<xsl:attribute name="href">
70 
										<xsl:value-of select="$tripleURI"/><xsl:value-of select="./@emlPackage"/></xsl:attribute>
71 
			     						<xsl:text>&#187;&#160;</xsl:text>Data Package
72 
			     				</a>
73 
			     			</td>
74 
			     			<td class="text_plain">
75 
								<pre class="inline"><xsl:value-of select="./@emlPackage"/></pre>
80 
										<xsl:value-of select="$tripleURI"/><xsl:value-of select="./@emlPackage"/>
81 
									</xsl:attribute>
82 
									<xsl:text>&#187;&#160;</xsl:text>
83 
									<xsl:value-of select="./@emlPackage"/>
84 
								</a>
76 85 
							</td>
77 86 
			     		</tr>
78 87 
			     		<tr>
79 
							<td class="text_plain">
80 
								<a>
88 
							<td class="rowodd">
89 
			     				Data Table
90 
			     			</td>
91 
			     			<td class="roweven">
92 
			     				<a>
81 93 
									<xsl:attribute name="href">
82 94 
										<xsl:value-of select="$tripleURI"/><xsl:value-of select="./@emlPackage"/>&amp;displaymodule=entity&amp;entitytype=dataTable&amp;entityindex=<xsl:value-of select="number(./@dataTable)+1"/>
83 95 
									</xsl:attribute>
84 
			     					<xsl:text>&#187;&#160;</xsl:text>Data Table
85 
			     				</a>
86 
			     			</td>
87 
			     			<td class="text_plain">
88 
								<pre class="inline"><xsl:value-of select="./@dataTable"/></pre>
96 
									<xsl:text>&#187;&#160;</xsl:text>
97 
									<xsl:value-of select="./@dataTable"/>
98 
								</a>
89 99 
							</td>
90 100 
			     		</tr>
91 101 
			     	</table>
......
98 108 
						<td class="text_plain" colspan="2">
99 109 
							<table class="subGroup subGroup_border">
100 110 
								<tr>
101 
									<th	style="text-align: left">
111 
									<th>
112 
										<xsl:attribute name="colspan">
113 
											<xsl:value-of select="count(./*[local-name()='measurement'])"/>
114 
										</xsl:attribute>
102 115 
										Observation
103 116 
									</th>
104 
									<th	style="text-align: left">
105 
										Measurement
106 
									</th>
107 117 
								</tr>
108 118 
								<tr valign="top">
109 
									<xsl:attribute name="class">
110 
					              			<xsl:choose>
111 
										    <xsl:when test="position() mod 2 = 1">rowodd</xsl:when>
112 
										    <xsl:when test="position() mod 2 = 0">roweven</xsl:when>
113 
										</xsl:choose>
114 
									</xsl:attribute>
115
119
116 120 
									<!-- observation entity -->
117 
									<td class="text_plain">
118 
										Class: <xsl:value-of select="substring-after(./*[local-name()='entity']/@id, ':')"/>
119 
										<br/>
120 
										Ontology: <xsl:value-of select="fn:namespace-uri-for-prefix(substring-before(./*[local-name()='entity']/@id, ':'), .)"/>
121 
										<br />
122 
										Label: <xsl:value-of select="./@label"/>
121 
									<td>
122 
										<xsl:attribute name="colspan">
123 
											<xsl:value-of select="count(./*[local-name()='measurement'])"/>
124 
										</xsl:attribute>
125 
										<table>
126 
											<tr>
127 
												<td class="rowodd">
128 
													Class:
129 
												</td>
130 
												<td class="roweven">
131 
													<xsl:attribute name="title">
132 
														<xsl:value-of select="fn:namespace-uri-for-prefix(substring-before(./*[local-name()='entity']/@id, ':'), .)"/>
133 
														<xsl:text>#</xsl:text>
134 
														<xsl:value-of select="substring-after(./*[local-name()='entity']/@id, ':')"/>
135 
													</xsl:attribute>
136 
													<xsl:value-of select="substring-after(./*[local-name()='entity']/@id, ':')"/>
137 
												</td>
138 
											</tr>
139
140 
											<tr>
141 
												<td class="rowodd">
142 
													Ontology:
143 
												</td>
144 
												<td class="roweven">
145 
													<xsl:value-of select="fn:namespace-uri-for-prefix(substring-before(./*[local-name()='entity']/@id, ':'), .)"/>
146 
												</td>
147 
											</tr>
148
149 
											<tr>
150 
												<td class="rowodd">
151 
													Label:
152 
												</td>
153 
												<td class="roweven">
154 
													<xsl:value-of select="./@label"/>
155 
												</td>
156 
											</tr>
157 
										</table>
123 158 
									</td>
159 
								</tr>
160 
								<tr>
124 161 
									<!-- measurement -->
125 
									<td class="text_plain">
126 
										<xsl:for-each select="./*[local-name()='measurement']">
162 
									<xsl:for-each select="./*[local-name()='measurement']">
163 
										<td class="text_plain">
127 164 
											<table class="subGroup subGroup_border">
128 165 
												<tr>
129 
													<td class="text_plain">
166 
													<th colspan="3">
167 
														Measurement (<xsl:value-of select="./@label" />)
168 
													</th>
169 
												</tr>
170 
												<tr>
171 
													<td class="rowodd">
130 172 
														Column:
131 173 
													</td>
132 
													<td class="text_plain">
174 
													<td class="roweven">
133 175 
														<xsl:for-each select="key('mapping', @label)">
134 176 
															<xsl:value-of select="./@attribute" />
135 177 
														</xsl:for-each>
136 178 
													</td>
137 
													<td></td>
179 
													<td class="roweven"></td>
138 180 
												</tr>
139 181 
												<tr>
140 
													<td class="text_plain">
182 
													<td class="rowodd">
141 183 
														Characteristic[s]:
142 184 
													</td>
143 
													<td class="text_plain">
185 
													<td class="roweven">
144 186 
														<xsl:for-each select="./*[local-name()='characteristic']">
145 
															<!--xsl:value-of select="./@id" /-->
146 
															<xsl:value-of select="substring-after(./@id, ':')"/>
187 
															<p>
188 
																<xsl:attribute name="title">
189 
																	<xsl:value-of select="fn:namespace-uri-for-prefix(substring-before(./@id, ':'), .)"/>
190 
																	<xsl:text>#</xsl:text>
191 
																	<xsl:value-of select="substring-after(./@id, ':')"/>
192 
																</xsl:attribute>
193 
																<xsl:value-of select="substring-after(./@id, ':')"/>
194 
															</p>
147 195 
														</xsl:for-each>
148 196 
													</td>
149 
													<td class="text_plain">
197 
													<!--
198 
													<td class="roweven">
150 199 
														<xsl:for-each select="./*[local-name()='characteristic']">
151 200 
															<xsl:value-of select="fn:namespace-uri-for-prefix(substring-before(./@id, ':'), .)"/>
152 201 
														</xsl:for-each>
153 202 
													</td>
203 
													-->
154 204 
												</tr>
155 205 
												<tr>
156 
													<td class="text_plain">
206 
													<td class="rowodd">
157 207 
														Standard:
158 208 
													</td>
159 
													<td class="text_plain">
160 
														<!-- xsl:value-of select="./*[local-name()='standard']/@id" /-->
161 
														<xsl:value-of select="substring-after(./*[local-name()='standard']/@id, ':')"/>
209 
													<td class="roweven">
210 
														<p>
211 
															<xsl:attribute name="title">
212 
																<xsl:value-of select="fn:namespace-uri-for-prefix(substring-before(./*[local-name()='standard']/@id, ':'), .)"/>
213 
																<xsl:text>#</xsl:text>
214 
																<xsl:value-of select="substring-after(./*[local-name()='standard']/@id, ':')"/>
215 
															</xsl:attribute>
216 
															<xsl:value-of select="substring-after(./*[local-name()='standard']/@id, ':')"/>
217 
														</p>
162 218 
													</td>
163 
													<td class="text_plain">
219 
													<!--
220 
													<td class="roweven">
164 221 
														<xsl:value-of select="fn:namespace-uri-for-prefix(substring-before(./*[local-name()='standard']/@id, ':'), .)"/>
165 222 
													</td>
223 
													-->
166 224 
												</tr>
167 225 
												<tr>
168 
													<td class="text_plain">
226 
													<td class="rowodd">
169 227 
														Protocol:
170 228 
													</td>
171 
													<td class="text_plain">
172 
														<!-- xsl:value-of select="./*[local-name()='protocol']/@id" /-->
173 
														<xsl:value-of select="substring-after(./*[local-name()='protocol']/@id, ':')"/>
229 
													<td class="roweven">
230 
														<p>
231 
															<xsl:attribute name="title">
232 
																<xsl:value-of select="fn:namespace-uri-for-prefix(substring-before(./*[local-name()='protocol']/@id, ':'), .)"/>
233 
																<xsl:text>#</xsl:text>
234 
																<xsl:value-of select="substring-after(./*[local-name()='protocol']/@id, ':')"/>
235 
															</xsl:attribute>
236 
															<xsl:value-of select="substring-after(./*[local-name()='protocol']/@id, ':')"/>
237 
														</p>
174 238 
													</td>
175 
													<td class="text_plain">
239 
													<!--
240 
													<td class="roweven">
176 241 
														<xsl:value-of select="fn:namespace-uri-for-prefix(substring-before(./*[local-name()='protocol']/@id, ':'), .)"/>
177 242 
													</td>
243 
													-->
178 244 
												</tr>
179 245 
											</table>
180 
										</xsl:for-each> <!-- measurement -->
181 
									</td>
246 
										</td>
247 
									</xsl:for-each> <!-- measurement -->
182 248 
								</tr>
183 249 
							</table>
184 250 
						</td>

Also available in: Unified diff