Added compatibility with old JSF versions; improved UCD description button (fddbc63a) · Commits · Marco Molinaro / tap_schema_manager

TapSchemaManager/src/main/webapp/resources/js/edit-tapschema.js

+8 −0

Original line number	Diff line number	Diff line
		@@ -152,6 +152,14 @@
		if (event.status === 'success') {
		$('.loading').addClass('hide');
		}
		},
		UCDDescriptionAdded: function (event, index) {
		if (event.status === 'success') {
		$('#searchUCDModal .resultDefinition:eq(' + index + ')').collapse('show');
		}
		},
		showUCDDescription: function (event) {
		$(event.target).closest('.ucd-selector-group').next().collapse('toggle');
		}
		};

TapSchemaManager/src/main/webapp/tapSchemaEditing.xhtml

+31 −26

Original line number	Diff line number	Diff line
		@@ -58,7 +58,7 @@
		<li>
		<h:commandLink role="tab" class="plus-tab" action="#{tapSchemaEditing.openAddablesModal(tapSchema)}">
		<span class="glyphicon glyphicon-plus-sign"></span>
		<f:ajax execute="@form" render="main:addables_modal_content" onevent="TSM.openAddablesModal" />
		<f:ajax execute="@form" render=":main:addables_modal_content" onevent="TSM.openAddablesModal" />
		</h:commandLink>
		</li>
		</h:panelGroup>
		@@ -112,9 +112,9 @@
		<li role="presentation" class="removable-tab #{tapSchema.selectedTable.name eq table.name ? 'active':''} #{table.toRemove? 'to-remove':''}">
		<h:commandLink role="tab" action="#{tapSchema.selectedEntity.selectEntity(table.name)}">
		<span class="#{table.toRemove ? 'strikeout':''}">#{table.name}</span>
		<f:ajax execute="@form" render="main:tables_wrapper" />
		<f:ajax execute="@form" render=":main:tables_wrapper" />
		<h:commandButton class="remove-btn" rendered="#{!table.toRemove}" action="#{tapSchema.selectedEntity.removeEntityWrapper(table.name)}" value="×" onclick="TSM.stopPropagation(event)">
		<f:ajax execute="@form" render="main:tables_wrapper" />
		<f:ajax execute="@form" render=":main:tables_wrapper" />
		</h:commandButton>
		</h:commandLink>
		</li>
		@@ -123,7 +123,7 @@
		<li>
		<h:commandLink role="tab" class="plus-tab" action="#{tapSchemaEditing.openAddablesModal(tapSchema.selectedEntity)}">
		<span class="glyphicon glyphicon-plus-sign"></span>
		<f:ajax execute="@form" render="main:addables_modal_content" onevent="TSM.openAddablesModal" />
		<f:ajax execute="@form" render=":main:addables_modal_content" onevent="TSM.openAddablesModal" />
		</h:commandLink>
		</li>
		</h:panelGroup>
		@@ -177,7 +177,7 @@
		Columns<h:outputText value=" " />
		<h:commandLink class="btn btn-success" rendered="#{tapSchema.selectedTable.addables.size() gt 0}" action="#{tapSchemaEditing.openAddablesModal(tapSchema.selectedTable)}">
		<span class="glyphicon glyphicon-plus-sign"></span>
		<f:ajax execute="@form" render="main:addables_modal_content" onevent="TSM.openAddablesModal" />
		<f:ajax execute="@form" render=":main:addables_modal_content" onevent="TSM.openAddablesModal" />
		</h:commandLink>
		</div>
		<h:panelGroup rendered="#{tapSchema.selectedColumn ne null}" layout="block" class="columns-header-properties">
		@@ -200,7 +200,7 @@
		<li role="presentation" class="#{tapSchema.selectedColumn.name eq column.name ? 'active': ''}">
		<h:commandLink role="tab" action="#{tapSchema.selectedTable.selectEntity(column.name)}" class="#{column.toRemove ? 'strikeout' : ''}" id="column-selector">
		<h:commandButton class="btn btn-link remove-btn" disabled="#{column.toRemove}" value="×" onclick="TSM.stopPropagation(event)" id="column-remover">
		<f:ajax execute="@form" render="main:column_wrapper main:columns_header" listener="#{tapSchemaEditing.removeColumn(column.name)}" onevent="TSM.columnRemoved" />
		<f:ajax execute="@form" render=":main:column_wrapper :main:columns_header" listener="#{tapSchemaEditing.removeColumn(column.name)}" onevent="TSM.columnRemoved" />
		</h:commandButton>

		<h:panelGroup rendered="#{column.primaryKey}">
		@@ -214,7 +214,7 @@
		</h:panelGroup>

		<span class="#{column.toRemove ? 'strikeout':''}">#{column.name}</span>
		<f:ajax execute="@form" render="main:column_wrapper main:columns_header" onevent="TSM.columnChanged" />
		<f:ajax execute="@form" render=":main:column_wrapper :main:columns_header" onevent="TSM.columnChanged" />
		</h:commandLink>
		</li>
		</ui:repeat>
		@@ -228,7 +228,7 @@
		This column will be removed on TAP Schema Update.
		<h:commandLink class="btn btn-primary pull-right" action="#{tapSchemaEditing.undoRemoveColumn()}">
		Undo
		<f:ajax execute="@form" render="main:column_wrapper main:columns_header" onevent="TSM.columnRemovalUndo" />
		<f:ajax execute="@form" render=":main:column_wrapper :main:columns_header" onevent="TSM.columnRemovalUndo" />
		</h:commandLink>
		</div>
		</h:panelGroup>
		@@ -284,10 +284,10 @@
		</h:inputText>
		</div>
		<div class="form-group">
		<label for="main:column_ucd" class="control-label">UCD:</label>
		<label for=":main:column_ucd" class="control-label">UCD:</label>
		<h:commandLink action="#{tapSchemaEditing.openUCDDialog()}" class="form-control #{tapSchemaEditing.tapSchema.selectedColumn.isChanged('ucd') ? 'changed' : ''}" id="column_ucd" onclick="TSM.showLoading()">
		#{tapSchemaEditing.tapSchema.selectedColumn.ucd}
		<f:ajax execute="@form" render="ucd_search_form:search_UCD_modal_content" onevent="TSM.openSearchUCDModal"/>
		<f:ajax execute="@form" render=":ucd_search_form:search_UCD_modal_content" onevent="TSM.openSearchUCDModal"/>
		</h:commandLink>
		</div>
		<div class="form-group">
		@@ -329,14 +329,14 @@
		<h:commandLink class="btn btn-default btn-sm" action="#{tapSchemaEditing.checkAllEntities(false)}">
		<span class="glyphicon glyphicon-remove"></span>
		Deselect all
		<f:ajax execute="@form" render="addables_modal_content" />
		<f:ajax execute="@form" render=":main:addables_modal_content" />
		</h:commandLink>
		</div>
		<div class="hpadding pull-right">
		<h:commandLink class="btn btn-default btn-sm" action="#{tapSchemaEditing.checkAllEntities(true)}">
		<span class="glyphicon glyphicon-ok"></span>
		Select all
		<f:ajax execute="@form" render="addables_modal_content" />
		<f:ajax execute="@form" render=":main:addables_modal_content" />
		</h:commandLink>
		</div>
		<h4 class="modal-title">Add</h4>
		@@ -363,7 +363,7 @@
		<button type="button" class="btn btn-default" data-dismiss="modal">Close</button>
		<h:commandLink class="btn btn-primary" action="#{tapSchemaEditing.addSelected}">
		Add
		<f:ajax execute="@form" render="main_panel" onevent="TSM.entitiesAdded" />
		<f:ajax execute="@form" render=":main:main_panel" onevent="TSM.entitiesAdded" />
		</h:commandLink>
		</div>
		</div>
		@@ -386,7 +386,7 @@
		<h:selectOneRadio value="#{UCDDialog.manualInsertion}" valueChangeListener="#{UCDDialog.setDefault()}">
		<f:selectItem itemValue="#{false}" itemLabel="Search by description" />
		<f:selectItem itemValue="#{true}" itemLabel="Manual insertion" />
		<f:ajax execute="@this" render="UCDDialogBodyMainContent ucdDialogFooter" />
		<f:ajax execute="@this" render=":ucd_search_form:UCDDialogBodyMainContent :ucd_search_form:ucdDialogFooter" />
		</h:selectOneRadio>
		</div>
		<h:panelGroup layout="block" id="UCDDialogBodyMainContent">
		@@ -426,7 +426,7 @@
		<h:panelGroup rendered="#{UCDDialog.selectedUCD ne null}">
		<div class="alert alert-info" role="alert">
		<strong>Selected UCD:</strong>
		<span>#{UCDDialog.selectedUCD}</span>
		<h:panelGroup id="selected-ucd">#{UCDDialog.selectedUCD}</h:panelGroup>
		</div>
		</h:panelGroup>

		@@ -434,30 +434,35 @@
		<label class="control-label">Suggested complete UCD:</label>
		<h:commandLink class="btn-default text-left form-control" action="#{UCDDialog.selectUCD(UCDDialog.suggestedUCD)}">
		#{UCDDialog.suggestedUCD}
		<f:ajax execute="@form" render="@form" />
		<f:ajax execute="@form" render=":ucd_search_form:selected-ucd" />
		</h:commandLink>
		</h:panelGroup>

		<h:panelGroup class="vpadding" layout="block" rendered="#{UCDDialog.suggestedUCDs.size() gt 0}">
		<label class="control-label">Other suggested UCD:</label>
		<ui:repeat value="#{UCDDialog.suggestedUCDs}" var="ucdInfo">
		<div class="input-group">
		<ui:repeat value="#{UCDDialog.suggestedUCDs}" var="ucdInfo" varStatus="loop">
		<h:panelGroup class="input-group ucd-selector-group" layout="block" id="ucd-selector-group">
		<span class="input-group-addon">#{ucdInfo.score}</span>
		<span class="input-group-addon flag#{ucdInfo.flag}">#{ucdInfo.flag}</span>
		<h:commandLink class="form-control text-left btn-default selectUCD" action="#{UCDDialog.selectUCD(ucdInfo.word)}">
		<span class="resultWord">#{ucdInfo.word}</span>
		<f:ajax execute="@form" render="@form" />
		<f:ajax execute="@form" render=":ucd_search_form:selected-ucd" />
		</h:commandLink>
		<span class="input-group-btn">
		<h:panelGroup class="input-group-btn" rendered="#{ucdInfo.definition eq null}">
		<h:commandLink class="btn btn-default" action="#{UCDDialog.explain(ucdInfo)}">
		<span class="glyphicon glyphicon-question-sign"></span>
		<f:ajax execute="@form" render="@form" />
		<f:ajax execute="@form" render="@this udc-definition ucd-selector-group" onevent="function (event) { TSM.UCDDescriptionAdded(event, #{loop.index}); }" />
		</h:commandLink>
		</span>
		</div>
		<h:panelGroup class="resultDefinition" layout="block" rendered="#{ucdInfo.definition ne null}">
		<span class="help-block">#{ucdInfo.definition}</span>
		</h:panelGroup>
		<h:panelGroup class="input-group-btn" rendered="#{ucdInfo.definition ne null}">
		<a class="btn btn-default" role="button" onclick="TSM.showUCDDescription(event)">
		<span class="glyphicon glyphicon-question-sign"></span>
		</a>
		</h:panelGroup>
		</h:panelGroup>
		<div class="resultDefinition collapse">
		<h:panelGroup class="help-block" id="udc-definition">#{ucdInfo.definition}</h:panelGroup>
		</div>
		</ui:repeat>
		</h:panelGroup>
		</h:panelGroup>
		@@ -466,7 +471,7 @@
		<h:panelGroup class="modal-footer" id="ucdDialogFooter" layout="block">
		<button type="button" class="btn btn-default" data-dismiss="modal">Close</button>
		<h:commandButton id="save_ucd" class="btn btn-primary" disabled="#{UCDDialog.selectedUCD eq null and !UCDDialog.manualInsertion}" action="#{tapSchemaEditing.saveUCD()}" onclick="TSM.showLoading()" value="Save changes">
		<f:ajax execute="@form" render="@form main:column_ucd" onevent="TSM.saveUCDCalled" />
		<f:ajax execute="@form" render="@form :main:column_ucd" onevent="TSM.saveUCDCalled" />
		</h:commandButton>
		</h:panelGroup>
		</h:panelGroup>