Project

General

Profile

« Previous | Next » 

Revision 9587

Added by Chris Jones about 8 years ago

Merge minor registry changes from the 2.6 branch back to the trunk.

refs https://github.nceas.ucsb.edu/KNB/arctic-data/issues/107

View differences:

entryForm.tmpl
4 4
	</script>
5 5
  <script language="JavaScript" type="text/javascript" src="[% styleCommonPath %]/templates/metacatui/entryForm.js">
6 6
  </script>
7
  <script language="JavaScript" type="text/javascript">
8
    // enable Bootstrap tooltip popovers for licensing choices
9
    $('.popover-target').popover();
10
  </script>
7 11

  
8 12
	<!-- CONTENT SECTION
9 13
    ======================================================================= -->
......
1237 1241
									<label class="control-label" for="dataMedium">*Data Medium</label>
1238 1242
									<div class="controls">
1239 1243
										[% IF form == 're_entry' && (dataMedium == "digital " || dataMedium == "digital")  %]  
1240
											<label class"radio inline">
1241
									            <input type="radio"  name="dataMedium" onClick="handleOther(0, 'otherDM')" value="digital" CHECKED>
1244
											<label class="radio">
1245
									            <input type="radio"  name="dataMedium" onClick="handleOther(0, 'otherDM')" value="digital" CHECKED />
1242 1246
									            Digital
1243 1247
									        </label>
1244 1248
								        [%ELSE%]
1245
								        	<label class"radio inline">
1246
									            <input type="radio"  name="dataMedium" onClick="handleOther(0, 'otherDM')" value="digital">
1249
								        	<label class="radio">
1250
									            <input type="radio"  name="dataMedium" onClick="handleOther(0, 'otherDM')" value="digital" />
1247 1251
									            Digital
1248 1252
									        </label> 
1249 1253
								        [% END %]
1250 1254
								        [% IF form == 're_entry' && (dataMedium == "hardcopy " || dataMedium == "hardcopy") %]  
1251
								        	<label class"radio inline">
1252
								           		<input type="radio"  name="dataMedium" onClick="handleOther(0, 'otherDM')" value="hardcopy" CHECKED>
1255
								        	<label class="radio">
1256
								           		<input type="radio"  name="dataMedium" onClick="handleOther(0, 'otherDM')" value="hardcopy" CHECKED />
1253 1257
								           		Hardcopy
1254 1258
								           	</label>
1255 1259
								        [%ELSE%]
1256
								        	<label class"radio inline">
1257
												<input type="radio"  name="dataMedium" onClick="handleOther(0, 'otherDM')" value="hardcopy">
1260
								        	<label class="radio">
1261
												<input type="radio"  name="dataMedium" onClick="handleOther(0, 'otherDM')" value="hardcopy" />
1258 1262
								           		Hardcopy
1259 1263
								           	</label>
1260 1264
								        [% END %]
1261 1265
								        [% IF form == 're_entry' && dataMedium == "other" %]
1262
								        	<label class"radio inline">
1263
									           <input type="radio" name="dataMedium" value="other" onClick="handleOther(1, 'otherDM')" CHECKED>
1266
								        	<label class="radio">
1267
									           <input type="radio" name="dataMedium" value="other" onClick="handleOther(1, 'otherDM')" CHECKED />
1264 1268
									           Other
1265 1269
									        </label>    
1266 1270
								        [%ELSE%]
1267
								        	<label class"radio inline">
1268
								           		<input type="radio"  name="dataMedium" onClick="handleOther(1, 'otherDM')" value="other">
1271
								        	<label class="radio">
1272
								           		<input type="radio"  name="dataMedium" onClick="handleOther(1, 'otherDM')" value="other" />
1269 1273
								           		Other
1270 1274
								           	</label>									           		
1271 1275
								        [% END %]
......
1276 1280
								<div class="control-group">
1277 1281
									<label class="control-label" for="useConstraints">*Usage Rights</label>
1278 1282
									<div class="controls">
1279
										[% IF form == 're_entry' && useConstraints == "no restrictions" %]
1280
											<label class"radio inline">      
1281
												<input type="radio"  name="useConstraints" onClick="handleOther(0, 'otherUC')" value="no restrictions" CHECKED>
1282
												No restrictions
1283
											</label>	
1284
										[%ELSE%]
1285
											<label class"radio inline">
1286
									            <input type="radio"  name="useConstraints" onClick="handleOther(0, 'otherUC')" value="no restrictions">
1287
									            No restrictions
1288
									        </label>
1289
										[%END%]
1290
										[% IF form == 're_entry' && useConstraints == "Obtain permission from data set owner(s)" %]   
1291
											<label class"radio inline">   
1292
										        <input type="radio"  name="useConstraints" onClick="handleOther(0, 'otherUC')" value="Obtain permission from data set owner(s)" CHECKED>
1293
										        Obtain permission from data set owner(s)
1294
										    </label> 
1295
										[%ELSE%]
1296
											<label class"radio inline">
1297
									            <input type="radio"  name="useConstraints" onClick="handleOther(0, 'otherUC')" value="Obtain permission from data set owner(s)">
1298
									            Obtain permission from data set owner(s)
1299
									        </label>
1300
										[%END%]
1301
										
1302
										[% IF form == 're_entry' && useConstraints == "other" %] 
1303
											<label class"radio inline">     
1304
												<input type="radio"  name="useConstraints" onClick="handleOther(1, 'otherUC')" value="other" CHECKED>
1305
											    Other
1306
											</label>    
1307
									    [%ELSE%]
1308
									    	<label class"radio inline">
1309
												<input type="radio"  name="useConstraints" onClick="handleOther(1, 'otherUC')" value="other">
1310
												Other
1311
											</label>	
1312
									    [%END%]
1313
										<input type="text" name="useConstraintsOther" id="otherUC" value="[%useConstraintsOther%]" size="49">
1314
									</div>
1283
                    <!-- Use Creative Commons license options -->
1284
                    [% IF show.cclicenses == 'true' %]
1285
                      <!-- Add CC-0 option -->
1286
                      [% IF form == 're_entry' && useConstraints == 'Public Domain (CC-0)' %]
1287
                        <label class="radio">
1288
                          <input type="radio" name="useConstraints" value="Public Domain (CC-0)" CHECKED />
1289
                          Creative Commons Public Domain
1290
                          <div class="btn btn-mini popover-target"
1291
                              data-original-title="Public Domain (CC-0)"
1292
                              data-toggle="popover"
1293
                              data-trigger="click"
1294
                              data-placement="top"
1295
                              data-html="true"
1296
                              data-content="By dedicating this work to the public domain, you waive your interest in your work and place the work as completely as possible in the public domain so others may freely use the work without restriction under copyright or database law. Attribution for your work is still expected according to norms in your research field. For details, see the <a href='https://creativecommons.org/publicdomain/zero/1.0/'>Creative Commons Public Domain Dedication</a>."
1297
                              title="">CC-0 1.0</div>
1298
                        </label>
1299
                        
1300
                      [% ELSE %]
1301
                        <label class="radio">
1302
                          <input type="radio" name="useConstraints" value="Public Domain (CC-0)" />
1303
                          Creative Commons Public Domain
1304
                          <div class="btn btn-mini popover-target"
1305
                              data-original-title="Public Domain (CC-0)"
1306
                              data-toggle="popover"
1307
                              data-trigger="click"
1308
                              data-placement="top"
1309
                              data-html="true"
1310
                              data-content="By dedicating this work to the public domain, you waive your interest in your work and place the work as completely as possible in the public domain so others may freely use the work without restriction under copyright or database law. Attribution for your work is still expected according to norms in your research field. For details, see the <a href='https://creativecommons.org/publicdomain/zero/1.0/'>Creative Commons Public Domain Dedication</a>."
1311
                              title="">CC-0 1.0</div>
1312
                        </label>
1313
                        
1314
                      [% END %]
1315
                      
1316
                      <!-- Add CC-BY option -->
1317
                      [% IF form == 're_entry' && useConstraints == 'Attribution (CC-BY)' %]
1318
                        <label class="radio">
1319
                          <input type="radio" name="useConstraints" value="Attribution (CC-BY)" CHECKED />
1320
                          Creative Commons Attribution
1321
                          <div class="btn btn-mini popover-target"
1322
                              data-original-title="Attribution (CC-BY)"
1323
                              data-toggle="popover"
1324
                              data-trigger="click"
1325
                              data-placement="top"
1326
                              data-html="true"
1327
                              data-content="By licensing this work, you let others copy, distribute, display, and perform your copyrighted work, and derivative works based upon it, but only if they give you appropriate credit. For details, see the <a href='https://creativecommons.org/publicdomain/zero/1.0/'>Creative Commons Attribution 4.0 License</a>."
1328
                              title="">CC-BY 4.0</div>
1329
                        </label>
1330
                        
1331
                      [% ELSE %]
1332
                        <label class="radio">
1333
                          <input type="radio" name="useConstraints" value="Attribution (CC-BY)" />
1334
                          Creative Commons Attribution
1335
                          <div class="btn btn-mini popover-target"
1336
                              data-original-title="Attribution (CC-BY)"
1337
                              data-toggle="popover"
1338
                              data-trigger="click"
1339
                              data-placement="top"
1340
                              data-html="true"
1341
                              data-content="By licensing this work, you let others copy, distribute, display, and perform your copyrighted work, and derivative works based upon it, but only if they give you appropriate credit. For details, see the <a href='https://creativecommons.org/publicdomain/zero/1.0/'>Creative Commons Attribution 4.0 License</a>."
1342
                              title="">CC-BY 4.0</div>
1343
                        </label>
1344
                                              
1345
                      [% END %]
1346
                      
1347
                    <!-- Or use custom license options -->
1348
                    [% ELSE %]
1349
                      [% IF form == 're_entry' && useConstraints == "no restrictions" %]
1350
                      	<label class="radio">      
1351
                      		<input type="radio" name="useConstraints" onClick="handleOther(0, 'otherUC')" value="no restrictions" CHECKED />
1352
                      		No restrictions
1353
                      	</label>	
1354
                      [%ELSE%]
1355
                      	<label class="radio">
1356
                                <input type="radio"  name="useConstraints" onClick="handleOther(0, 'otherUC')" value="no restrictions">
1357
                                No restrictions
1358
                            </label>
1359
                      [%END%]
1360
                      
1361
                      [% IF form == 're_entry' && useConstraints == "Obtain permission from data set owner(s)" %]   
1362
                      	<label class="radio">   
1363
                              <input type="radio"  name="useConstraints" onClick="handleOther(0, 'otherUC')" value="Obtain permission from data set owner(s)" CHECKED />
1364
                              Obtain permission from data set owner(s)
1365
                          </label> 
1366
                      [%ELSE%]
1367
                      	<label class="radio">
1368
                                <input type="radio"  name="useConstraints" onClick="handleOther(0, 'otherUC')" value="Obtain permission from data set owner(s)" />
1369
                                Obtain permission from data set owner(s)
1370
                            </label>
1371
                      [%END%]
1372
                      
1373
                      [% IF form == 're_entry' && useConstraints == "other" %] 
1374
                      	<label class="radio">     
1375
                      		<input type="radio"  name="useConstraints" onClick="handleOther(1, 'otherUC')" value="other" CHECKED />
1376
                      	    Other
1377
                      	</label>    
1378
                        [%ELSE%]
1379
                        	<label class="radio">
1380
                      		<input type="radio"  name="useConstraints" onClick="handleOther(1, 'otherUC')" value="other" />
1381
                      		Other
1382
                      	</label>	
1383
                        [%END%]
1384
                      <input type="text" name="useConstraintsOther" id="otherUC" value="[%useConstraintsOther%]" size="49" />
1385
                    [% END %]
1386
                  </div>
1315 1387
								</div>
1316 1388
								
1317 1389
								<div class="control-group">
......
1348 1420
									<tr class="sectbody">
1349 1421
									    <td class="rightCol"><span class="text-info">Upload Data File</span></td>
1350 1422
									    <td colspan="5">
1351
								        	<input type="file" id="file_element" name="file_1" class="longwidth">
1423
								        	<input class="btn" type="file" id="file_element" name="file_1" class="longwidth">
1352 1424
								
1353 1425
									        [% IF form == 're_entry' && upCount %]
1354 1426
									           [% cnt = 0 %]

Also available in: Unified diff