diff --git a/tool/src/java/org/sakaiproject/attendance/tool/pages/ImportConfirmation.html b/tool/src/java/org/sakaiproject/attendance/tool/pages/ImportConfirmation.html index cd71892..cf18db7 100644 --- a/tool/src/java/org/sakaiproject/attendance/tool/pages/ImportConfirmation.html +++ b/tool/src/java/org/sakaiproject/attendance/tool/pages/ImportConfirmation.html @@ -24,37 +24,37 @@

- - + +

- +
- - - - - - + + + + + + - - - - - - + + + + + + - diff --git a/tool/src/java/org/sakaiproject/attendance/tool/pages/ImportConfirmation.java b/tool/src/java/org/sakaiproject/attendance/tool/pages/ImportConfirmation.java index 518b2d6..fde8f8c 100644 --- a/tool/src/java/org/sakaiproject/attendance/tool/pages/ImportConfirmation.java +++ b/tool/src/java/org/sakaiproject/attendance/tool/pages/ImportConfirmation.java @@ -86,8 +86,8 @@ public boolean isVisible() { }; attendanceItemTableContainer.add(oldCommentContainer); attendanceItemTableContainer.add(newCommentContainer); - oldCommentContainer.add(new Label("old-comment", "Old Comment")); - newCommentContainer.add(new Label("new-comment", "New Comment")); + oldCommentContainer.add(new Label("old-comment", getString("attendance.export.confirmation.header.oldComment"))); + newCommentContainer.add(new Label("new-comment", getString("attendance.export.confirmation.header.newComment"))); } private void createStatsTableData(WebMarkupContainer attendanceItemTableContainer, List attendanceItemDataList, boolean commentsChanged) { diff --git a/tool/src/webapp/css/attendance.css b/tool/src/webapp/css/attendance.css index e966a4b..0c02acf 100644 --- a/tool/src/webapp/css/attendance.css +++ b/tool/src/webapp/css/attendance.css @@ -186,73 +186,10 @@ table.itemListTable, table.eventViewTable, table.takeAttendanceTable, div.eventF background-color: var(--sakai-background-color-4); } -th.overviewDateCol, td.overviewDateCol, td.takeAttendanceDateHeader, th.takeAttendanceDateHeader, td.studentNameCol, th.studentOverviewNameHeader, th.importEventandStudentHeader, th.importNewCommentandStatusHeader,th.importOldCommentandStatusHeader { +th.overviewDateCol, td.overviewDateCol, td.takeAttendanceDateHeader, th.takeAttendanceDateHeader, td.studentNameCol, th.studentOverviewNameHeader { border-right-width: 3px; } -.importChangeTable th{ - text-align: center; - border-bottom-width: 2px; - font-size: 1.2em; - vertical-align: bottom; -} - -.importChangeTable td{ - border: 1px solid #ccc; - padding: .5em; - text-align: right; -} - -.importChangeTable th{ - border: 1px solid #ccc; - padding: .5em; - text-align: center; -} - -.importChangeTable thead tr{ - background-color: #eee; -} - -.importChangeTable tbody tr:hover{ - background-color: #deeeff; -} - -table.importChangeTable{ - border: 2px solid #ccc; - border-collapse: collapse; - padding: .5em; - margin-left: 35px; -} - -table.importChangeTable thead tr .header{ - background: url(../images/bg.gif) no-repeat bottom .5em right; - cursor: pointer; - padding-right: 24px; -} - -table.importChangeTable thead tr .headerSortUp{ - background-image: url(../images/asc.gif); -} -table.importChangeTable thead tr .headerSortDown{ - background-image: url(../images/desc.gif); -} - -table.importChangeTable thead tr th.importEventandStudentHeader{ - background-color: lightgray; -} - -table.importChangeTable thead tr th.importNewCommentandStatusHeader{ - background-color: lightgreen; -} - -table.importChangeTable thead tr th.importOldCommentandStatusHeader{ - background-color: lightcoral; -} - -td.importColumn{ - text-align: right; -} - .eventViewTable td { text-align: right; font-size: 1.2em; @@ -911,104 +848,6 @@ div.wicket-modal div.w_content_3 div.messageSuccess, div.wicket-modal div.w_cont padding: 7px 30px 7px 30px; } -.cancel { - background: #e54028; - -webkit-border-radius: 3px; - -moz-border-radius: 3px; - -ms-border-radius: 3px; - -o-border-radius: 3px; - border-radius: 3px; - -webkit-box-shadow: none; - -moz-box-shadow: none; - box-shadow: none; - -webkit-transition-property: background; - -moz-transition-property: background; - -o-transition-property: background; - transition-property: background; - -webkit-transition-duration: 0.3s; - -moz-transition-duration: 0.3s; - -o-transition-duration: 0.3s; - transition-duration: 0.3s; - color: #ffffff; - text-shadow: none; - border: none; - height: 32px; - line-height: 32px; - padding: 0px 25.6px; - font-weight: 300; - margin: 0; - text-decoration: none; - text-align: center; - display: inline-block; -} - -.cancel:active { - background: darkred; - -webkit-box-shadow: inset 0px 1px 0px rgba(255, 255, 255, 0.03), inset 0px -1px 1px rgba(255, 255, 255, 0.05), 0px 1px 0px #777777, 0px 3px 3px rgba(0, 0, 0, 0.03); - -moz-box-shadow: inset 0px 1px 0px rgba(255, 255, 255, 0.3), inset 0px -1px 1px rgba(255, 255, 255, 0.05), 0px 1px 0px #777777, 0px 3px 3px rgba(0, 0, 0, 0.03); - box-shadow: inset 0px 1px 0px rgba(255, 255, 255, 0.03), inset 0px -1px 1px rgba(255, 255, 255, 0.05), 0px 1px 0px #777777, 0px 3px 3px rgba(0, 0, 0, 0.03); -} -.cancel:hover { - background: #FF530D; - text-decoration: none; - color: #ffffff; -} -.cancel:active { - background: darkred; - -webkit-box-shadow: inset 0px 1px 0px rgba(255, 255, 255, 0.03), inset 0px -1px 1px rgba(255, 255, 255, 0.05), 0px 1px 0px #777777, 0px 3px 3px rgba(0, 0, 0, 0.03); - -moz-box-shadow: inset 0px 1px 0px rgba(255, 255, 255, 0.3), inset 0px -1px 1px rgba(255, 255, 255, 0.05), 0px 1px 0px #777777, 0px 3px 3px rgba(0, 0, 0, 0.03); - box-shadow: inset 0px 1px 0px rgba(255, 255, 255, 0.03), inset 0px -1px 1px rgba(255, 255, 255, 0.05), 0px 1px 0px #777777, 0px 3px 3px rgba(0, 0, 0, 0.03); -} - -.confirm { - background: #00B233; - -webkit-border-radius: 3px; - -moz-border-radius: 3px; - -ms-border-radius: 3px; - -o-border-radius: 3px; - border-radius: 3px; - -webkit-box-shadow: none; - -moz-box-shadow: none; - box-shadow: none; - -webkit-transition-property: background; - -moz-transition-property: background; - -o-transition-property: background; - transition-property: background; - -webkit-transition-duration: 0.3s; - -moz-transition-duration: 0.3s; - -o-transition-duration: 0.3s; - transition-duration: 0.3s; - color: #ffffff; - text-shadow: none; - border: none; - height: 32px; - line-height: 32px; - padding: 0px 25.6px; - font-weight: 300; - margin: 0; - text-decoration: none; - text-align: center; - display: inline-block; -} - -.confirm:active { - background: darkgreen; - -webkit-box-shadow: inset 0px 1px 0px rgba(255, 255, 255, 0.03), inset 0px -1px 1px rgba(255, 255, 255, 0.05), 0px 1px 0px #777777, 0px 3px 3px rgba(0, 0, 0, 0.03); - -moz-box-shadow: inset 0px 1px 0px rgba(255, 255, 255, 0.3), inset 0px -1px 1px rgba(255, 255, 255, 0.05), 0px 1px 0px #777777, 0px 3px 3px rgba(0, 0, 0, 0.03); - box-shadow: inset 0px 1px 0px rgba(255, 255, 255, 0.03), inset 0px -1px 1px rgba(255, 255, 255, 0.05), 0px 1px 0px #777777, 0px 3px 3px rgba(0, 0, 0, 0.03); -} -.confirm:hover { - background: lightgreen; - text-decoration: none; - color: #ffffff; -} -.confirm:active { - background: darkgreen; - -webkit-box-shadow: inset 0px 1px 0px rgba(255, 255, 255, 0.03), inset 0px -1px 1px rgba(255, 255, 255, 0.05), 0px 1px 0px #777777, 0px 3px 3px rgba(0, 0, 0, 0.03); - -moz-box-shadow: inset 0px 1px 0px rgba(255, 255, 255, 0.3), inset 0px -1px 1px rgba(255, 255, 255, 0.05), 0px 1px 0px #777777, 0px 3px 3px rgba(0, 0, 0, 0.03); - box-shadow: inset 0px 1px 0px rgba(255, 255, 255, 0.03), inset 0px -1px 1px rgba(255, 255, 255, 0.05), 0px 1px 0px #777777, 0px 3px 3px rgba(0, 0, 0, 0.03); -} - .iclPage{ padding-left: 35px; }
+