diff options
author | mconway <michael_conway@unc.edu> | 2013-06-07 15:48:19 (GMT) |
---|---|---|
committer | mconway <michael_conway@unc.edu> | 2013-06-07 15:48:19 (GMT) |
commit | 874f73bd43f2f36966a0abdc9768a9e2c32343c1 (patch) | |
tree | e5629be6e9566c5cbf42f659d19e219be5946b5b /idrop-web | |
parent | 064a7423406da7f2c7083ab525077cfa1422e096 (diff) | |
download | QCG-Data-874f73bd43f2f36966a0abdc9768a9e2c32343c1.zip QCG-Data-874f73bd43f2f36966a0abdc9768a9e2c32343c1.tar.gz QCG-Data-874f73bd43f2f36966a0abdc9768a9e2c32343c1.tar.bz2 |
[#1475] ie fixes
Diffstat (limited to 'idrop-web')
-rwxr-xr-x | idrop-web/grails-app/views/browse/_browseTabContent.gsp | 4 | ||||
-rwxr-xr-x | idrop-web/grails-app/views/browse/collectionInfo.gsp | 321 |
2 files changed, 191 insertions, 134 deletions
diff --git a/idrop-web/grails-app/views/browse/_browseTabContent.gsp b/idrop-web/grails-app/views/browse/_browseTabContent.gsp index 0a31ba0..334a69f 100755 --- a/idrop-web/grails-app/views/browse/_browseTabContent.gsp +++ b/idrop-web/grails-app/views/browse/_browseTabContent.gsp @@ -13,8 +13,6 @@ <div id="browseDialogArea"><!-- general area to spawn jquery dialogs --></div> - - <div id="browser" class="wrapper" style="height:85%;width:100%;clear:both;overflow:hidden;"> <div id="dataTreeView" style="width: 100%; height: 700px; overflow: hidden;"> @@ -48,7 +46,7 @@ <div id="infoDivOuter" style="display: block; width: 75%; height: 100%; position: relative; overflow: auto;" class="ui-layout-center"> - <div id="infoDiv" style=""><h2><g:message code="browse.page.prompt" /></h2> + <div id="infoDiv" class=""><h2><g:message code="browse.page.prompt" /></h2> </div> <!-- infoDiv --> </div> <!-- infoDivOuter --> diff --git a/idrop-web/grails-app/views/browse/collectionInfo.gsp b/idrop-web/grails-app/views/browse/collectionInfo.gsp index 6308786..407d4a7 100755 --- a/idrop-web/grails-app/views/browse/collectionInfo.gsp +++ b/idrop-web/grails-app/views/browse/collectionInfo.gsp @@ -1,156 +1,215 @@ <g:hiddenField id="infoAbsPath" name="absolutePath" value="${collection.collectionName}" /> <div id="infoMessageArea"> - <!-- --> - </div> + <!-- --> +</div> <div id="idropLiteArea"> - <!-- area to show idrop lite applet --> + <!-- area to show idrop lite applet --> </div> -<div id="toggleHtmlArea"> +<div id="toggleHtmlArea" style="width: 100%;"> <g:render template="/browse/collectionInfoToolbar" /> - <div id="infoDialogArea"><!-- no empty divs --></div> - - <!-- display area lays out info in a main and side column --> - <div id="infoDisplayLayout" style="width:100%;height:100%;"> - + <div id="infoDialogArea"> + <!-- no empty divs --> + </div> + <!-- display area lays out info in a main and side column --> <div class="well"> - <image style="float:left;margin-right:10px;" src="<g:resource dir="images" file="folder.png" alt="folder icon" />"/> - <h3>${collection.collectionName}</h3> - </div> -</div> + <image style="float:left;margin-right:10px;" + src="<g:resource dir="images" file="folder.png" alt="folder icon" />" /> + <h3> + ${collection.collectionName} + </h3> + </div> -<ul class="nav nav-tabs" id="infoTabs"> - <li class="active"><a href="#info" id="infoTab"><g:message code="text.info" /></a></li> - <li><a href="#metadata" id="metadataTab"><g:message code="text.metadata" /></a></li> - <li><a href="#permissions" id="permissionTab"><g:message code="text.sharing" /></a></li> - <g:if test="${grailsApplication.config.idrop.config.use.tickets==true}"> - <li><a href="#tickets" id="ticketTab"><g:message code="text.tickets" /></a></li> - </g:if> - <li><a href="#audit" id="auditTab"><g:message code="text.audit" /></a></li> -</ul> - -<div class="tab-content"> - <div class="tab-pane active" id="info"> - - <h4><g:message code="text.info" /></h4> - <div class="alert alert-info"> - <g:message code="heading.info" /> - </div> - - <div id="container" style="height:100%;width:100%;"> - <div> - <div style="width:15%;"><label><g:message code="text.created" />:</label></div> - <div>${collection.createdAt}</div> + + <ul class="nav nav-tabs" id="infoTabs"> + <li class="active"><a href="#info" id="infoTab"><g:message + code="text.info" /></a></li> + <li><a href="#metadata" id="metadataTab"><g:message + code="text.metadata" /></a></li> + <li><a href="#permissions" id="permissionTab"><g:message + code="text.sharing" /></a></li> + <g:if + test="${grailsApplication.config.idrop.config.use.tickets==true}"> + <li><a href="#tickets" id="ticketTab"><g:message + code="text.tickets" /></a></li> + </g:if> + <li><a href="#audit" id="auditTab"><g:message + code="text.audit" /></a></li> + </ul> + + <div class="tab-content" style="width: 100%;"> + <div class="tab-pane active" id="info"> + + <div class="container-fluid"> + <div class="row"> + <div class="span12"> + <h4> + <g:message code="text.info" /> + </h4> + </div> </div> - <div> - <div><label><g:message code="text.updated" />:</label></div> - <div>${collection.modifiedAt}</div> + <div class="row alert alert-info"> + <div class="span12"> + <g:message code="heading.info" /> + </div> </div> - <div> - <div><label><g:message code="text.owner" />:</label></div> - <div>${collection.collectionOwnerName}</div> + <div class="row"> + <div class="span2"> + <label><g:message code="text.created" />:</label> + </div> + <div class="span10"> + ${collection.createdAt} + </div> </div> - <div> - <div><label><g:message code="text.owner.zone" />:</label></div> - <div>${collection.collectionOwnerZone}</div> + <div class="row"> + <div class="span2"> + <label><g:message code="text.updated" />:</label> + </div> + <div class="span10"> + ${collection.modifiedAt} + </div> </div> - <div> - <div><label><g:message code="text.type" />:</label></div> - <div>${collection.specColType}</div> + <div class="row"> + <div class="span2"> + <label><g:message code="text.owner" />:</label> + </div> + <div class="span10"> + ${collection.collectionOwnerName} + </div> </div> - <div> - <div><label><g:message code="text.object.path" />:</label></div> - <div>${collection.objectPath}</div> + <div class="row"> + <div class="span2"> + <label><g:message code="text.owner.zone" />:</label> + </div> + <div class="span10"> + ${collection.collectionOwnerZone} + </div> </div> - <div> - <div><label><g:message code="text.description" />:</label></div> - <div>${collection.comments}</div> + <div class="row"> + <div class="span2"> + <label><g:message code="text.type" />:</label> + </div> + <div class="span10"> + ${collection.specColType} + </div> </div> - <div> - <div><label><g:message code="text.info" />1:</label></div> - <div>${collection.info1}</div> + <div class="row"> + <div class="span2"> + <label><g:message code="text.object.path" />:</label> + </div> + <div class="span10"> + ${collection.objectPath} + </div> </div> - <div> - <div><label><g:message code="text.info" />2:</label></div> - <div>${collection.info2}</div> + <div class="row"> + <div class="span2"> + <label><g:message code="text.description" />:</label> + </div> + <div class="span10"> + ${collection.comments} + </div> </div> - - </div> - <div id="container" style="height:100%;width:100%;"> - <div> - <div><label><g:message code="text.tags" />:</label></div> - <div><g:textField id="infoTags" name="tags" - value="${tags.spaceDelimitedTagsForDomain}" /></div> + <div class="row"> + <div class="span2"> + <label><g:message code="text.info" />1:</label> + </div> + <div class="span10"> + ${collection.info1} + </div> </div> - <div> - <div><label><g:message code="text.comment" />:</label></div> - <div><g:textArea id="infoComment" name="comment" rows="5" cols="80" - value="${comment}" /></div> + <div class="row"> + <div class="span2"> + <label><g:message code="text.info" />2:</label> + </div> + <div class="span10"> + ${collection.info2} + </div> </div> - <div> - <div></div> - <div><button type="button" id="updateTags" value="updateTags" onclick="updateTags()">Update Tags</button></div> + + <div class="row"> + <div class="span2"> + <label><g:message code="text.tags" />:</label> + </div> + <div class="span10"> + <g:textField id="infoTags" name="tags" + value="${tags.spaceDelimitedTagsForDomain}" /> + </div> </div> - </div> - - </div> - <div class="tab-pane" id="metadata"> - <div id="infoAccordionMetadataInner"></div> - </div> - <div class="tab-pane" id="permissions"> - <div id="infoAccordionACLInner"></div> - </div> - <g:if test="${grailsApplication.config.idrop.config.use.tickets==true}"> - <div class="tab-pane" id="tickets"> - <div id="infoAccordionTicketsInner"> + <div class="row"> + <div class="span2"> + <label><g:message code="text.comment" />:</label> + </div> + <div class="span10"> + <g:textArea id="infoComment" name="comment" rows="5" cols="80" + value="${comment}" /> + </div> </div> + <div class="row"> + <div class="span2"></div> + <div class="span10"> + <button type="button" id="updateTags" value="updateTags" + onclick="updateTags()">Update Tags</button> + </div> + </div> + </div> + </div> - </g:if> - <div class="tab-pane" id="audit"> - <div id="infoAccordionAuditInner"></div> - </div> + <div class="tab-pane" id="metadata"> + <div id="infoAccordionMetadataInner"></div> + </div> + <div class="tab-pane" id="permissions"> + <div id="infoAccordionACLInner"></div> + </div> + <g:if + test="${grailsApplication.config.idrop.config.use.tickets==true}"> + <div class="tab-pane" id="tickets"> + <div id="infoAccordionTicketsInner"></div> + </div> + </g:if> + <div class="tab-pane" id="audit"> + <div id="infoAccordionAuditInner"></div> + </div> + </div> + </div> +<!-- toggle html area --> + + +<script> + $(function() { + + $(".idropLiteBulkUpload").show(); + $("#menuDownload").hide(); + $("#menuUpload").show(); + $("#menuBulkUpload").show(); + + $('#infoTabs a').click(function(e) { + e.preventDefault(); + $(this).tab('show'); + }); + + $('#infoTab').on('shown', function(e) { + //e.target // activated tab + //e.relatedTarget // previous tab + showMetadataView(selectedPath, "#infoAccordionMetadataInner"); + }); + + $('#metadataTab').on('shown', function(e) { + showMetadataView(selectedPath, "#infoAccordionMetadataInner"); + }); + + $('#permissionTab').on('shown', function(e) { + showSharingView(selectedPath, "#infoAccordionACLInner"); + }); + + $('#ticketTab').on('shown', function(e) { + showTicketView(selectedPath, "#infoAccordionTicketsInner"); + }); + + $('#auditTab').on('shown', function(e) { + showAuditView(selectedPath, "#infoAccordionAuditInner"); + }); -</div><!-- toggle html area --> - - - <script> - $(function() { - - $(".idropLiteBulkUpload").show(); - $("#menuDownload").hide(); - $("#menuUpload").show(); - $("#menuBulkUpload").show(); - - - $('#infoTabs a').click(function (e) { - e.preventDefault(); - $(this).tab('show'); - }); - - $('#infoTab').on('shown', function (e) { - //e.target // activated tab - //e.relatedTarget // previous tab - showMetadataView(selectedPath, "#infoAccordionMetadataInner"); - }); - - $('#metadataTab').on('shown', function (e) { - showMetadataView(selectedPath, "#infoAccordionMetadataInner"); - }); - - $('#permissionTab').on('shown', function (e) { - showSharingView(selectedPath, "#infoAccordionACLInner"); - }); - - $('#ticketTab').on('shown', function (e) { - showTicketView(selectedPath, "#infoAccordionTicketsInner"); - }); - - $('#auditTab').on('shown', function (e) { - showAuditView(selectedPath, "#infoAccordionAuditInner"); - }); - - }); - - </script> + }); +</script> |