Subversion Repositories bacoAlunos

Compare Revisions

Ignore whitespace Rev 1762 → Rev 1764

/branches/v3/impl/conf/WEB-INF/tags/repositoryFile.tag
12,11 → 12,13
<%@attribute name="iconClasses" type="java.lang.String" required="false" %>
<%@attribute name="downloadIcon" type="java.lang.Boolean" required="false" %>
<%@attribute name="showHistory" type="java.lang.Boolean" required="false" %>
<%@attribute name="target" type="java.lang.String" required="false" %>
<%@attribute name="btnXs" type="java.lang.Boolean" required="false" %>
<%@attribute name="iconLeft" type="java.lang.Boolean" required="false" %>
 
<%
 
String targetStr = target == null ? "" : " target=\"" + target + "\" ";
boolean history = showHistory == null ? true: showHistory;
boolean iconLeftPos = iconLeft == null ? false: true;
String btnXsClass = btnXs != null && btnXs == true ? " btn-xs " : "";
33,7 → 35,7
<%
}
%>
<a data-toggle="tooltip" title="Descarregar" class="btn ${btnXsClass} btn-default <%=iconClasses!= null?iconClasses:""%>" href="<%=request.getContextPath()%>/repositoryStream/${repositoryStream}"><span class="glyphicon glyphicon-download-alt"></span></a>
<a data-toggle="tooltip" title="Descarregar" <%=targetStr%> class="btn ${btnXsClass} btn-default <%=iconClasses!= null?iconClasses:""%>" href="<%=request.getContextPath()%>/repositoryStream/${repositoryStream}"><span class="glyphicon glyphicon-download-alt"></span></a>
<%
if(history){%>
<a data-toggle="tooltip" title="Histórico" class="btn ${btnXsClass} btn-default <%=iconClasses!= null?iconClasses:""%>" target="_blank" href="<%=request.getContextPath()%>/user/data.jsp?id=${repositoryStream}"><span class="icon icon-history icon-large"></span></a>
88,12 → 90,13
%>
 
<span class="badge icon <%=iconClasses!= null?iconClasses:""%>">
<a data-toggle="tooltip" title="Descarregar" href="javascript:invoqueDataVersionForm(${repositoryStream})"><span class="icon icon-history icon-large"></span></a>
<a data-toggle="tooltip" <%=targetStr%> title="Descarregar" href="<%=request.getContextPath()%>/repositoryStream/${repositoryStream}"><span class="<%=iconFile%>"></span></a>
</span>
<%if(history){%>
<span class="badge icon <%=iconClasses!= null?iconClasses:""%>">
<a data-toggle="tooltip" title="Histórico" href="<%=request.getContextPath()%>/repositoryStream/${repositoryStream}"><span class="<%=iconFile%>"></span></a>
</span>
<span class="badge icon <%=iconClasses!= null?iconClasses:""%>">
<a data-toggle="tooltip" title="Histórico" href="javascript:invoqueDataVersionForm(${repositoryStream})"><span class="icon icon-history icon-large"></span></a>
</span>
 
<%}%>
<%
}
121,7 → 124,7
<%
}
%>
<a data-toggle="tooltip" title="Descarregar" class="btn ${btnXsClass} btn-default <%=iconClasses!= null?iconClasses:""%>" href="<%=request.getContextPath()%>/repositoryStream/${repositoryStream}"><span class="<%=iconFile%>"></span></a>
<a data-toggle="tooltip" title="Descarregar" <%=targetStr%> class="btn ${btnXsClass} btn-default <%=iconClasses!= null?iconClasses:""%>" href="<%=request.getContextPath()%>/repositoryStream/${repositoryStream}"><span class="<%=iconFile%>"></span></a>
<%if(history){%>
<a data-toggle="tooltip" title="Histórico" class="btn ${btnXsClass} btn-default <%=iconClasses!= null?iconClasses:""%>" href="javascript:invoqueDataVersionForm(${repositoryStream})"><span class="icon icon-history icon-large"></span></a>
<%}%>
/branches/v3/impl/src/web/css/styleRepositoryDocs.css
62,15 → 62,20
color: #606060;
padding-left: 10px;
text-transform: none;
border-left: 1px dashed rgba(178, 164, 24, 0.55);
border-left: 2px dashed rgba(178, 164, 24, 0.55);
border-bottom: 2px dashed rgba(178, 164, 24, 0.55);
border-top-left-radius: 15px;
border-bottom-left-radius: 15px;
border-bottom-right-radius: 15px;
-moz-border-radius-topleft: 15px;
-moz-border-radius-bottomleft: 15px;
-moz-border-radius-bottomright: 15px;
-webkit-border-top-left-radius: 15px;
-webkit-border-bottom-left-radius: 15px;
-webkit-border-bottom-right-radius: 15px;
padding-top: 5px;
padding-bottom: 5px;
margin-bottom: 10px;
}
 
.repository-column .repository-block .repository-document .repository-document-files
142,17 → 147,18
.repository-column .repository-block .repository-document-file .repository-title
{
font-weight: normal;
background-color: rgba(207, 207, 207, 0.24);
border-top-left-radius: 15px;
border-top-right-radius: 15px;
-moz-border-radius-topleft: 15px;
-moz-border-radius-topright: 15px;
-webkit-border-top-left-radius: 15px;
-webkit-border-top-right-radius: 15px;
background-color: rgba(207, 207, 207, 0.10);
border-top-left-radius: 10px;
border-top-right-radius: 10px;
-moz-border-radius-topleft: 10px;
-moz-border-radius-topright: 10px;
-webkit-border-top-left-radius: 10px;
-webkit-border-top-right-radius: 10px;
margin:0;
padding-top:5px;
padding-left:10px;
padding-right:5px;
padding-bottom: 5px;
border:0;
}
.repository-column .repository-block .repository-document-file .repository-title .repository-file-icon
/branches/v3/impl/src/web/auth/loginWidget.jsp
132,7 → 132,7
<div class="form-group clearfix">
<label class="col-md-12" style="margin-bottom: 10px"><jomm:messageConfigKey config="authentication.policy.password.msg.key"/></label>
<div class="col-md-6">
<input type="password" class="form-control" name="password"/>
<input type="password" class="form-control" name="password" onkeyup="if(event.keyCode == 13){event.preventDefault();authenticateWidget();}"/>
</div>
</div>
<div class="col-sm-2">
/branches/v3/impl/src/web/layout/themes/ipp/header.jsp
13,6 → 13,11
<img class="logo" src="<%=request.getContextPath()%>/layout/themes/ipp/logo.png"/>
 
<h1> Centro de Sistemas de Informação do IPP </h1>
<logic:present name="UserSession" property="user">
<logic:notEmpty name="UserSession" property="user">
<p>(<bean:write name="UserSession" property="user.name"/> online)</p>
</logic:notEmpty>
</logic:present>
 
 
<div class="pull-right" style="margin-right: 40px;">
/branches/v3/impl/src/web/user/repositoryDocuments/showInterfaceDocsFragment.jsp
140,7 → 140,7
<baco:hasNotRole role="admin,all,repositoryDocs,repositoryDeposit">
<nested:equal value="true" name="interfaceBlock" property="showFileTitle">
<%--label="${docFile.repositoryFileProxy.repositoryFile.lastVersion.name}--%>
<bacoTags:repositoryFile transactional="true" showHistory="false" iconClasses="pull-left repository-file-icon" repositoryStream="${docFile.repositoryFileProxy.repositoryStream}" label="${docFile.title}"/>
<bacoTags:repositoryFile transactional="true" showHistory="false" iconClasses="pull-left repository-file-icon" repositoryStream="${docFile.repositoryFileProxy.repositoryStream}" label="${docFile.title}"/>
</nested:equal>
<nested:notEqual value="true" name="interfaceBlock" property="showFileTitle">
<bacoTags:repositoryFile transactional="true" showHistory="false" iconClasses="pull-left repository-file-icon" repositoryStream="${docFile.repositoryFileProxy.repositoryStream}"/>