Index: lams_learning/web/notebook/addnew.jsp =================================================================== diff -u -r580d89078524d7f06eccd71feefc7e6f98717538 -r37456eedc8b0580b57b6fcb255323c5c49943119 --- lams_learning/web/notebook/addnew.jsp (.../addnew.jsp) (revision 580d89078524d7f06eccd71feefc7e6f98717538) +++ lams_learning/web/notebook/addnew.jsp (.../addnew.jsp) (revision 37456eedc8b0580b57b6fcb255323c5c49943119) @@ -22,44 +22,38 @@ <%@ page import="org.lamsfoundation.lams.notebook.service.CoreNotebookConstants"%> <%@ include file="/common/taglibs.jsp"%> - + + <%=CoreNotebookConstants.SCRATCH_PAD_SIG%> + + + <%=CoreNotebookConstants.JOURNAL_SIG%> + + - - <fmt:message key="mynotes.title" /> - + <fmt:message key="mynotes.title" /> - - - - + + + + - - - <%=CoreNotebookConstants.SCRATCH_PAD_SIG%> - - - <%=CoreNotebookConstants.JOURNAL_SIG%> - - - @@ -71,27 +65,22 @@ -
- - -
-
- - -
-
- - -
- - - +
+ + +
+
+ + +
+
+ + +
- - Index: lams_learning/web/notebook/view.jsp =================================================================== diff -u -r8f4be61ce9ac48ffc767138df8932b7f70427cdd -r37456eedc8b0580b57b6fcb255323c5c49943119 --- lams_learning/web/notebook/view.jsp (.../view.jsp) (revision 8f4be61ce9ac48ffc767138df8932b7f70427cdd) +++ lams_learning/web/notebook/view.jsp (.../view.jsp) (revision 37456eedc8b0580b57b6fcb255323c5c49943119) @@ -23,42 +23,29 @@ <%@ include file="/common/taglibs.jsp"%> <%@ page import="org.lamsfoundation.lams.notebook.service.CoreNotebookConstants"%> - + +<%=CoreNotebookConstants.SCRATCH_PAD_SIG%> +<%=CoreNotebookConstants.JOURNAL_SIG%> + - - <fmt:message key="mynotes.title" /> - + <fmt:message key="mynotes.title" /> - - - - + + - - - - - - <%=CoreNotebookConstants.SCRATCH_PAD_SIG%> - - - <%=CoreNotebookConstants.JOURNAL_SIG%> - - - + @@ -68,46 +55,41 @@ + - - - + - + - -

- - - + ${title} - + ${title}

-
+
@@ -120,12 +102,10 @@
- - - +
@@ -134,7 +114,7 @@ - + Index: lams_learning/web/notebook/viewall.jsp =================================================================== diff -u -r8f4be61ce9ac48ffc767138df8932b7f70427cdd -r37456eedc8b0580b57b6fcb255323c5c49943119 --- lams_learning/web/notebook/viewall.jsp (.../viewall.jsp) (revision 8f4be61ce9ac48ffc767138df8932b7f70427cdd) +++ lams_learning/web/notebook/viewall.jsp (.../viewall.jsp) (revision 37456eedc8b0580b57b6fcb255323c5c49943119) @@ -20,45 +20,41 @@ --%> - <%@ include file="/common/taglibs.jsp"%> + - - <fmt:message key="mynotes.title" /> - + <fmt:message key="mynotes.title" /> - - - - - - - - - - + - + + + + + -
+ key="mynotes.add.new.current.lesson.button" /> +
@@ -87,11 +83,10 @@

- - + - - - + -

@@ -116,11 +111,10 @@

- - + - - - + -

@@ -145,7 +139,7 @@ - + @@ -167,12 +161,6 @@
- - Index: lams_learning/web/notebook/viewalljournals.jsp =================================================================== diff -u -r8f4be61ce9ac48ffc767138df8932b7f70427cdd -r37456eedc8b0580b57b6fcb255323c5c49943119 --- lams_learning/web/notebook/viewalljournals.jsp (.../viewalljournals.jsp) (revision 8f4be61ce9ac48ffc767138df8932b7f70427cdd) +++ lams_learning/web/notebook/viewalljournals.jsp (.../viewalljournals.jsp) (revision 37456eedc8b0580b57b6fcb255323c5c49943119) @@ -20,30 +20,24 @@ --%> - <%@ include file="/common/taglibs.jsp"%> + - - <fmt:message key="mynotes.title" /> - + <fmt:message key="mynotes.title" /> - - - - + + + - -

@@ -70,7 +64,10 @@ -

+

+ +

+ @@ -90,7 +87,7 @@ - + @@ -103,10 +100,10 @@
- + + +
- -