wellton/AmadeusLMS
1
0
Fork 0
Código Issues Pull Requests Ações Pacotes Projetos Versões Wiki Atividade

Correções de conflitos jsp no merge

Ver Código-Fonte
Esse commit está contido em:
Paulo Henrique
2014-11-20 01:16:49 -03:00
pai b07429c707
commit f33a047460
6 arquivos alterados com 8 adições e 41 exclusões
Baixar Arquivo de Patch Baixar Arquivo de Diff Expandir todos os arquivos Colapsar todos os arquivos
WebContent/WEB-INF/web.xml
+1 -1
Ver Arquivo
@@ -53,7 +53,7 @@
/WEB-INF/struts/struts-config-settings.xml,
/WEB-INF/struts/struts-config-log.xml,
/WEB-INF/struts/struts-config-messenger.xml,
/WEB-INF/struts/struts-config-twittertool.xml
/WEB-INF/struts/struts-config-twittertool.xml,
/WEB-INF/struts/struts-config-log.xml</param-value>
</init-param>
<load-on-startup>2</load-on-startup>
WebContent/jsp/conf/courseMenu.jsp
+1 -4
Ver Arquivo
@@ -33,15 +33,12 @@ Você deve ter recebido uma cópia da Licença Pública Geral GNU, sob o título
<c:if test="${selectedPosition == 4}"><li><b>Avaliações do Curso</b></li></c:if>
<c:if test="${selectedPosition != 4}"><li><html:link action="course.do?method=showViewCourseEvaluations&courseId=${course.id}">Avaliações do Curso</html:link></li></c:if>
</c:if>
<<<<<<< HEAD
=======
<c:if test="${canViewGroups}">
<c:if test="${selectedPosition == 6}"><li><b>Grupos</b></li></c:if>
<c:if test="${selectedPosition != 6}"><li><html:link action="course.do?method=showViewGroups&courseId=${course.id}">Grupos</html:link></li></c:if>
</c:if>
>>>>>>> 661708b07f533da1f47ab2b8c362cb287fdf4631
<c:if test="${canViewGraphic}">
<c:if test="${selectedPosition == 5}"><li><b>Módulo de Visualização</b></li></c:if>
<c:if test="${selectedPosition != 5}"><li><html:link action="course.do?method=showViewGraphic&courseId=${course.id}&graphic=sel&moduleSel=-1&idAluno=-1&idGame=-1">Módulo de Visualização</html:link></li></c:if>
WebContent/jsp/conf/header.jsp
-13
Ver Arquivo
@@ -20,16 +20,12 @@ Você deve ter recebido uma cópia da Licença Pública Geral GNU, sob o título
<link href="themes/default/css/css.css" rel="stylesheet" type="text/css" />
<link href="themes/default/css/amadeus.css" rel="stylesheet" type="text/css" />
<<<<<<< HEAD
<link href="themes/default/css/messenger.css" rel="stylesheet" type="text/css" />
<link href="themes/default/css/twittertool.css" rel="stylesheet" type="text/css" />
=======
>>>>>>> 661708b07f533da1f47ab2b8c362cb287fdf4631
<link href="themes/default/css/content_management.css" rel="stylesheet" type="text/css" />
<link href="themes/default/css/jqueryui/smoothness/jquery-ui-1.7.1.custom.css" rel="stylesheet" type="text/css" />
<link href="themes/default/imgs/favicon.ico" rel="shortcut icon" />
<<<<<<< HEAD
<!-- <link href="themes/default/css/bootstrap-responsive.min.css" rel="stylesheet" type="text/css"/>
<link href="themes/default/css/bootstrap.min.css" rel="stylesheet" type="text/css"/> -->
<link href="themes/default/css/nyroModal.css" rel="stylesheet" type="text/css"/>
@@ -52,15 +48,6 @@ Você deve ter recebido uma cópia da Licença Pública Geral GNU, sob o título
<script type="text/javascript" src="js/amadeus.js"></script>
<script type="text/javascript" src="js/messenger.js"></script>
<script type="text/javascript" src="js/twittertool.js"></script>
=======
<script type='text/javascript' src='dwr/interface/UtilDWR.js'></script>
<script type='text/javascript' src='dwr/engine.js'></script>
<script type='text/javascript' src='dwr/util.js'></script>
<script type="text/javascript" src="js/jqueryui/jquery-1.3.2.min.js"></script>
<script type="text/javascript" src="js/jqueryui/jquery-ui-1.7.1.custom.min.js"></script>
<script type="text/javascript" src="js/openid.js"></script>
<script type="text/javascript" src="js/amadeus.js"></script>
>>>>>>> 661708b07f533da1f47ab2b8c362cb287fdf4631
<script type="text/javascript">
WebContent/jsp/course/viewGraphic.jsp
-3
Ver Arquivo
@@ -100,14 +100,11 @@ function selectGame()
<div id="pLeftMenu" class="pLeftMenu">
<c:set var="selectedPosition" value="5" scope="request" />
<jsp:include page="/jsp/conf/courseMenu.jsp" />
<<<<<<< HEAD
<!-- Added By Nailson Cunha -->
<div id="twitter-container">
<jsp:include page="/jsp/twittertool/userTwitter.jsp" />
</div>
=======
>>>>>>> 661708b07f533da1f47ab2b8c362cb287fdf4631
</div>
<div id="pContent" class="pContent2">
src/br/ufpe/cin/amadeus/amadeus_web/struts/messages/MessageResources_en_US.properties
+2 -9
Ver Arquivo
@@ -766,22 +766,16 @@ course.showViewCourse=showViewCourse
course.showViewCourseNotLogged=showViewCourseNotLogged
course.showViewCourseParticipants=showViewCourseParticipants
course.showViewEditCourse=showViewEditCourse
<<<<<<< HEAD
course.showViewSocialInteractionMonitoring=showViewSocialInteractionMonitoring
course.showViewSocialInteractionMonitoringReports=showViewSocialInteractionMonitoringReports
=======
course.showViewCreateGroup=showViewCreateGroup
>>>>>>> 661708b07f533da1f47ab2b8c362cb287fdf4631
course.showViewShowModules=showViewShowModules
course.showViewCourseEvaluations=showViewCourseEvaluations
course.showViewSendMail=showViewSendMail
course.sendMailForCourseParticipants=sendMailForCourseParticipants
course.changeTeacher=changeTeacher
course.viewChangeTeacher=viewChangeTeacher
course.viewChangeTeacher=viewChangeTeacher
course.showViewGraphic=showViewGraphic
<<<<<<< HEAD
course.showPlayGame=showPlayGame
=======
course.showViewGroupDayTimeline=showViewGroupDayTimeline
course.showViewPersonDayTimeline=showViewPersonDayTimeline
course.showViewGroups=showViewGroups
@@ -791,7 +785,6 @@ course.showViewGroupTimeline=showViewGroupTimeline
course.showViewPersonTimeline=showViewPersonTimeline
course.showPlayGame=showPlayGame
course.showViewGroupsRelatorio=showViewRelatorioAtividade
>>>>>>> 661708b07f533da1f47ab2b8c362cb287fdf4631
#-- MAP Action method module --
module.showViewEditModule=showViewEditModule
@@ -886,7 +879,7 @@ managerUsers.profileType=*Profile type:
managerUsers.profileType.type=Type
managerUsers.profileType.admin=Administrator
managerUsers.profileType.student=Student
managerUsers.profileType.professor=Teacher
managerUsers.profileType.professor=Teacher
#-- Log --
log.saveLog=saveLog
src/br/ufpe/cin/amadeus/amadeus_web/struts/messages/MessageResources_pt_BR.properties
+4 -11
Ver Arquivo
@@ -760,32 +760,25 @@ course.showViewCourseNotLogged=showViewCourseNotLogged
course.showViewCourseParticipants=showViewCourseParticipants
course.unregisterStudentCourse=unregisterStudentCourse
course.showViewEditCourse=showViewEditCourse
<<<<<<< HEAD
course.showViewSocialInteractionMonitoring=showViewSocialInteractionMonitoring
course.showViewSocialInteractionMonitoringReports=showViewSocialInteractionMonitoringReports
=======
course.showViewCreateGroup=showViewCreateGroup
>>>>>>> 661708b07f533da1f47ab2b8c362cb287fdf4631
course.showViewShowModules=showViewShowModules
course.showViewCourseEvaluations=showViewCourseEvaluations
course.showViewSendMail=showViewSendMail
course.sendMailForCourseParticipants=sendMailForCourseParticipants
course.changeTeacher=changeTeacher
course.viewChangeTeacher=viewChangeTeacher
course.sendMailForCourseParticipants=sendMailForCourseParticipants
<<<<<<< HEAD
course.showViewGraphic=showViewGraphic
=======
course.viewChangeTeacher=viewChangeTeacher
course.sendMailForCourseParticipants=sendMailForCourseParticipants
course.showViewGraphic=showViewGraphic
course.showViewGroupDayTimeline=showViewGroupDayTimeline
course.showViewPersonDayTimeline=showViewPersonDayTimeline
course.showViewGroups=showViewGroups
course.habilitarDesabilitarCriarGrupos=habilitarDesabilitarCriarGrupos
course.showViewGroupTimeline=showViewGroupTimeline
course.showViewPersonTimeline=showViewPersonTimeline
course.showViewPersonTimeline=showViewPersonTimeline
course.showViewOneGroup=showViewOneGroup
course.showViewGroupsRelatorio=showViewRelatorioAtividade
>>>>>>> 661708b07f533da1f47ab2b8c362cb287fdf4631
#-- MAP Action method module --
module.showViewEditModule=showViewEditModule
@@ -885,7 +878,7 @@ managerUsers.profileType=*Tipo de Perfil:
managerUsers.profileType.type=Tipo
managerUsers.profileType.admin=Administrador
managerUsers.profileType.student=Aluno
managerUsers.profileType.professor=Professor
managerUsers.profileType.professor=Professor
#-- Log --
log.saveLog=saveLog