Subversion Repositories bacoAlunos

Compare Revisions

Ignore whitespace Rev 1759 → Rev 1760

/branches/v3/impl/src/web/user/repositoryDocuments/adminDocument.jsp
296,7 → 296,7
<button class="btn btn-default btn-lg btn-block btn-huge" ng-click="backEdit()"><span class="glyphicon glyphicon-chevron-left"></span> Voltar à edição</button>
</div>
<div class="col-md-4">
<html:link styleClass="btn btn-success btn-lg btn-block btn-huge" action="/user/repositoryEditDocument">Adicionar outro documento <span class="glyphicon glyphicon-chevron-right"></span></html:link>
<html:link styleClass="btn btn-success btn-lg btn-block btn-huge" action="/user/repositoryEditDocument?repositoryCollectionId={{doc.collection.id}}">Adicionar outro documento <span class="glyphicon glyphicon-chevron-right"></span></html:link>
</div>
</div>
<hr/>
/branches/v3/impl/src/web/user/repositoryDocuments/adminBuiltInterfaces.jsp
193,7 → 193,7
<button ng-click="url(i)" class="btn btn-default"><span class="glyphicon glyphicon-globe"></span></button>
</td>
<td>
<a class="btn btn-default" ng-href="{{getUrl(i)}}"><span class="glyphicon glyphicon-play"></span></a>
<a class="btn btn-default" target="_blank" ng-href="{{getUrl(i)}}"><span class="glyphicon glyphicon-play"></span></a>
</td>
</tr>
</tbody>
/branches/v3/impl/src/web/user/repositoryDocuments/showInterfaceDocsFragment.jsp
59,7 → 59,7
<span class="glyphicon glyphicon-file btn-xs"></span>
<span class="title">${doc.title}</span>
<baco:hasRole role="admin,all,repositoryDocs,repositoryDeposit">
<html:link styleClass="btn btn-xs btn-default pull-right" action="/user/repositoryEditDocument?repositoryDocumentId=${doc.id}" target="_blank">
<html:link styleClass="btn btn-warning pull-right" action="/user/repositoryEditDocument?repositoryDocumentId=${doc.id}" target="_blank">
<span class="glyphicon glyphicon-pencil"></span>
</html:link>
</baco:hasRole>
/branches/v3/impl/src/web/user/repositoryDocuments/adminInterfaceBuilder.jsp
336,7 → 336,7
 
 
 
<pre class="code">{{ data | json }}</pre>
<%--<pre class="code">{{ data | json }}</pre>--%>
 
</div>
 
502,6 → 502,10
</div>
<div class="panel-body">
 
<div class="alert alert-warning" ng-show="block.showTitle == false && !block.tree && block.browseMinimizeMaximize">
Aviso: Título oculto, Lista Flat e Iniciar Minimizado implica que não aparece o bloco do Titulo com o Expandir
</div>
 
<div class="form-group">
<label class="col-md-3 control-label">Título</label>
<div class="col-md-7">
/branches/v3/impl/src/web/user/repositoryDocuments/showInterface.jsp
15,6 → 15,7
<%@ page import="java.util.List" %>
<%@ page import="static org.hibernate.criterion.Restrictions.le" %>
<%@ page import="static org.hibernate.criterion.Restrictions.*" %>
<%@ page import="org.hibernate.FlushMode" %>
<%@ taglib uri="/WEB-INF/tlds/struts-html.tld" prefix="html" %>
<%@ taglib uri="/WEB-INF/tlds/struts-nested.tld" prefix="nested" %>
<%@ taglib uri="/WEB-INF/tlds/struts-logic.tld" prefix="logic" %>
245,10 → 246,40
 
 
%>
<baco:hasRole role="admin,all,repositoryDocs,repositoryDeposit">
<logic:notEmpty name="interfaceBlock" property="collectionIds">
<%
if(collections != null && collections.size() == 1 && interfaceBlock.isTree())
{
request.setAttribute("colToAdd",collections.get(0));
%>
<div class="well well-sm clearfix">
<%=DaoFactory.getRepositoryDocumentCollectionDaoImpl().load(collections.get(0)).getName()%>
<html:link styleClass="btn btn-success pull-right" action="/user/repositoryEditDocument?repositoryCollectionId=${colToAdd}" target="_blank">
<span class="glyphicon glyphicon-plus"> </span> na Raiz da Árvore
</html:link>
</div>
<%
}
%>
</logic:notEmpty>
</baco:hasRole>
<div class="repository-block">
<div class="repository-intro" <%=toogleAttrs%>>
<%
if(!interfaceBlock.isTree() && interfaceBlock.isBrowseMinimizeMaximize() && !interfaceBlock.isShowTitle())
{
//Caso o titulo não esteja a ser mostrado e a colecção esteja minimizada e seja flat não vamos ter +/- para expandir
%>
<div class="repository-title">
<span class="btn-xs glyphicon <%=folderIcon%>" style="margin-right: 5px"></span>
<span class="btn-xs glyphicon glyphicon-bookmark"></span>
<label <%=styleCol%>>Bloco de Documentos (Aviso: Titulo Inexistente ou oculto, contacte a administração para verificar a situação)</label>
</div>
<%
}
%>
<logic:equal value="true" name="interfaceBlock" property="showTitle">
 
<div class="repository-title">
<span class="btn-xs glyphicon <%=folderIcon%>" style="margin-right: 5px"></span>
<span class="btn-xs glyphicon glyphicon-bookmark"></span>
263,22 → 294,19
{
request.setAttribute("colToAdd",collections.get(0));
%>
<html:link styleClass="btn btn-xs btn-success pull-right" action="/user/repositoryEditDocument?repositoryCollectionId=${colToAdd}" target="_blank">
<span class="glyphicon glyphicon-plus"></span>
</html:link>
<div class="well well-sm clearfix">
<%=DaoFactory.getRepositoryDocumentCollectionDaoImpl().load(collections.get(0)).getName()%>
<html:link styleClass="btn btn-success pull-right" action="/user/repositoryEditDocument?repositoryCollectionId=${colToAdd}" target="_blank">
<span class="glyphicon glyphicon-plus"> </span>
</html:link>
</div>
<%
}
else if(collections != null && collections.size() == 1 && interfaceBlock.isTree())
{
%>
<html:link styleClass="btn btn-success pull-right" action="/user/repositoryEditDocument?repositoryCollectionId=${colToAdd}" target="_blank">
<span class="glyphicon glyphicon-plus"> na Raiz da Colecção</span>
</html:link>
<%
}
%>
</logic:notEmpty>
</baco:hasRole>
 
 
<logic:equal value="true" name="interfaceBlock" property="showDescription">
<div class="repository-description">
${interfaceBlock.description}
389,5 → 417,6
</div>
 
<%
 
AbstractDao.getCurrentSession().getTransaction().rollback();
%>
/branches/v3/impl/src/web/user/repositoryDocuments/showInterfaceColFragment.jsp
35,7 → 35,7
<span class="btn-xs glyphicon <%=folderIcon%>" style="margin-right: 5px"></span>
<label <%=styleCol%> >${collection.name}</label>
<baco:hasRole role="admin,all,repositoryDocs,repositoryDeposit">
<html:link styleClass="btn btn-xs btn-success pull-right" action="/user/repositoryEditDocument?repositoryCollectionId=${collection.id}" target="_blank">
<html:link styleClass="btn btn-success pull-right" action="/user/repositoryEditDocument?repositoryCollectionId=${collection.id}" target="_blank">
<span class="glyphicon glyphicon-plus"></span>
</html:link>
</baco:hasRole>