Index: lams_central/web/main.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_central/web/main.jsp,v
diff -u -r1.77.2.46 -r1.77.2.47
--- lams_central/web/main.jsp	24 Feb 2017 19:59:38 -0000	1.77.2.46
+++ lams_central/web/main.jsp	8 Mar 2017 21:31:11 -0000	1.77.2.47
@@ -175,119 +175,117 @@
 <div id="page-wrapper">
 
 	<!-- header -->
-	<div class="top_nav">
-		<div class="nav_menu">
-			<nav>
-				<div class="offcanvas-toggle offcanvas-toggle-header">
-					<i class="fa fa-bars tour-course-reveal"></i>
-				</div>
+	<div class="top-nav">
+	
+		<div class="offcanvas-toggle offcanvas-toggle-header">
+			<i class="fa fa-bars tour-course-reveal"></i>
+		</div>
 
-				<ul class="nav navbar-nav navbar-right">
-					<li>
-						<a href="javascript:;" class="user-profile dropdown-toggle tour-user-profile" data-toggle="dropdown" aria-expanded="false">
-	                  		<c:choose>
-	                  			<c:when test="${not empty portraitUuid}">
-	                  				<c:set var="portraitSrc">download/?uuid=${portraitUuid}&preferDownload=false</c:set>
-	                  			</c:when>
-	                  			<c:otherwise>
-	                  				<c:set var="portraitSrc">images/css/john-doe-portrait.jpg</c:set>
-	                  			</c:otherwise>
-	                  		</c:choose>
-			                <img src="${portraitSrc}" alt="">
+		<ul class="nav navbar-nav navbar-right">
+			<li>
+				<a href="javascript:;" class="user-profile dropdown-toggle tour-user-profile" data-toggle="dropdown" aria-expanded="false">
+	           		<c:choose>
+	           			<c:when test="${not empty portraitUuid}">
+	           				<c:set var="portraitSrc">download/?uuid=${portraitUuid}&preferDownload=false</c:set>
+	           			</c:when>
+	           			<c:otherwise>
+	           				<c:set var="portraitSrc">images/css/john-doe-portrait.jpg</c:set>
+	           			</c:otherwise>
+	           		</c:choose>
+		            <img src="${portraitSrc}" alt="">
 			                  
-							<c:set var="firstName">
-								<lams:user property="firstName" />
-							</c:set>
-							<c:set var="lastName">
-								 <lams:user property="lastName" />
-							</c:set>
-							<span class="xs-hidden">
-								<c:out value="${firstName}" escapeXml="true"/>&nbsp;<c:out value="${lastName}" escapeXml="true"/>								
-							</span>
-							<span class=" fa fa-angle-down"></span>
-						</a>
+					<c:set var="firstName">
+						<lams:user property="firstName" />
+					</c:set>
+					<c:set var="lastName">
+						 <lams:user property="lastName" />
+					</c:set>
+					<span class="xs-hidden">
+						<c:out value="${firstName}" escapeXml="true"/>&nbsp;<c:out value="${lastName}" escapeXml="true"/>								
+					</span>
+					<span class=" fa fa-angle-down"></span>
+				</a>
 						
-						<ul class="dropdown-menu dropdown-usermenu pull-right">
-							<li>
-								<a href="#" onclick="javascript:showMyProfileDialog(); return false;">
-									<i class="fa fa-user"></i> <fmt:message key="index.myprofile"/>
-								</a>
-							</li>
-							
-							<c:forEach var="adminlink" items="${adminLinks}">
-								
-								<c:choose>
-			                		<c:when test="${adminlink.name == 'index.courseman'}">
-			                			<c:set var="iconClass">fa-users</c:set>
-			                		</c:when>
-			                		<c:when test="${adminlink.name == 'index.sysadmin'}">
-			                			<c:set var="iconClass">fa-gear</c:set>
-			                		</c:when>
-			                	</c:choose>
-									
-								<li>
-									<a href="javascript:;" onclick="<c:out value="${adminlink.url}"/>">
-										<span><i class="fa ${iconClass}"></i> <fmt:message key="${adminlink.name}"/></span>
-									</a>
-								</li>
-							</c:forEach>
-							                  
-							<li>
-								<a href="#nogo" onclick="javascript:closeAllChildren(); document.location.href='home.do?method=logout'">
-									<i class="fa fa-sign-out"></i> <fmt:message key="index.logout" />
-								</a>
-							</li>
-						</ul>
+				<ul class="dropdown-menu dropdown-usermenu pull-right">
+					<li>
+						<a href="#" onclick="javascript:showMyProfileDialog(); return false;">
+							<i class="fa fa-user"></i> <fmt:message key="index.myprofile"/>
+						</a>
 					</li>
-					
-					<c:forEach var="headerlink" items="${headerLinks}">
-						<c:choose>
-							<c:when test="${fn:startsWith(headerlink.name, 'index')}">
-								<c:set var="headerLinkName"><fmt:message key="${headerlink.name}" /></c:set>
-								<c:set var="headerLinkIcon">fa-edit</c:set>
-							</c:when>
 							
-							<c:otherwise>							
-								<c:set var="headerLinkName"><c:out value="${headerlink.name}" /></c:set>
-								<c:set var="headerLinkIcon">fa-at</c:set>
-							</c:otherwise>
-						</c:choose>
+					<c:forEach var="adminlink" items="${adminLinks}">
 						
 						<c:choose>
-							<c:when test="${fn:length(headerLinkName) > 12}">
-								<c:set var="headerLinkTitle" value="${headerLinkName}"/>
-								<c:set var="headerLinkName" value="${fn:substring(headerLinkName, 0, 12-2)}..."/>
-							</c:when>
-							<c:otherwise>
-								<c:set var="headerLinkName" value="${headerLinkName}"/>
-							</c:otherwise>
-						</c:choose>
-						
-						<li role="presentation">       
-							<a href="<c:out value='${headerlink.url}' />"  class="tour-${headerlink.id}" title="${headerLinkTitle}">
-								<i class="fa ${headerLinkIcon}"></i> 
-								<span class="xs-hidden"><c:out value='${headerLinkName}'/></span>
+		               		<c:when test="${adminlink.name == 'index.courseman'}">
+		               			<c:set var="iconClass">fa-users</c:set>
+		               		</c:when>
+		               		<c:when test="${adminlink.name == 'index.sysadmin'}">
+		               			<c:set var="iconClass">fa-gear</c:set>
+		               		</c:when>
+		               	</c:choose>
+									
+						<li>
+							<a href="javascript:;" onclick="<c:out value="${adminlink.url}"/>">
+								<span><i class="fa ${iconClass}"></i> <fmt:message key="${adminlink.name}"/></span>
 							</a>
 						</li>
 					</c:forEach>
-
-					<li role="presentation" class="dropdown">   
-						<a href="javascript:;" onclick="javascript:showPrivateNotificationsDialog();" class="dropdown-toggle info-number tour-user-notifications" data-toggle="dropdown" aria-expanded="false">
-							<i class="fa fa-envelope-o"></i>
-                    		<span id="notificationsPendingCount" class="btn-default"></span>
+							                  
+					<li>
+						<a href="#nogo" onclick="javascript:closeAllChildren(); document.location.href='home.do?method=logout'">
+							<i class="fa fa-sign-out"></i> <fmt:message key="index.logout" />
 						</a>
 					</li>
+				</ul>
+			</li>
 					
-					<li role="presentation" class="dropdown">       
-						<a href="javascript:;" onclick="javascript:startTour();" class="dropdown-toggle info-number" data-toggle="dropdown" aria-expanded="false">
-							<i class="fa fa-question-circle"></i>
-							<span class="xs-hidden"><fmt:message key="label.tour"/></span>
-						</a>
-					</li>
+			<c:forEach var="headerlink" items="${headerLinks}">
+				<c:choose>
+					<c:when test="${fn:startsWith(headerlink.name, 'index')}">
+						<c:set var="headerLinkName"><fmt:message key="${headerlink.name}" /></c:set>
+						<c:set var="headerLinkIcon">fa-edit</c:set>
+					</c:when>
+							
+					<c:otherwise>							
+						<c:set var="headerLinkName"><c:out value="${headerlink.name}" /></c:set>
+						<c:set var="headerLinkIcon">fa-at</c:set>
+					</c:otherwise>
+				</c:choose>
+						
+				<c:choose>
+					<c:when test="${fn:length(headerLinkName) > 12}">
+						<c:set var="headerLinkTitle" value="${headerLinkName}"/>
+						<c:set var="headerLinkName" value="${fn:substring(headerLinkName, 0, 12-2)}..."/>
+					</c:when>
+					<c:otherwise>
+						<c:set var="headerLinkName" value="${headerLinkName}"/>
+					</c:otherwise>
+				</c:choose>
+						
+				<li role="presentation">
+					<a href="<c:out value='${headerlink.url}' />"  class="tour-${headerlink.id}" title="${headerLinkTitle}">
+						<i class="fa ${headerLinkIcon}"></i> 
+						<span class="xs-hidden"><c:out value='${headerLinkName}'/></span>
+					</a>
+				</li>
+			</c:forEach>
+
+			<li role="presentation" class="dropdown">
+				<a href="javascript:;" onclick="javascript:showPrivateNotificationsDialog();" class="dropdown-toggle info-number tour-user-notifications" data-toggle="dropdown" aria-expanded="false">
+					<i class="fa fa-envelope-o"></i>
+               		<span id="notificationsPendingCount" class="btn-default"></span>
+				</a>
+			</li>
 					
-				</ul>
-			</nav>
-		</div>
+			<li role="presentation" class="dropdown">
+				<a href="javascript:;" onclick="javascript:startTour();" class="dropdown-toggle info-number" data-toggle="dropdown" aria-expanded="false">
+					<i class="fa fa-question-circle"></i>
+					<span class="xs-hidden"><fmt:message key="label.tour"/></span>
+				</a>
+			</li>
+					
+		</ul>
+
 	</div>
 	<!-- /header -->
 
Index: lams_central/web/css/defaultHTML_learner.css
===================================================================
RCS file: /usr/local/cvsroot/lams_central/web/css/defaultHTML_learner.css,v
diff -u -r1.32.2.45 -r1.32.2.46
--- lams_central/web/css/defaultHTML_learner.css	6 Mar 2017 00:37:02 -0000	1.32.2.45
+++ lams_central/web/css/defaultHTML_learner.css	8 Mar 2017 21:31:11 -0000	1.32.2.46
@@ -157,11 +157,11 @@
   padding: 3px 5px;
 }
 .panel-learner-page {
-  border-radius: 0px;
+  border-radius: 6px;
   box-shadow: 0 1px 1px rgba(8, 8, 8, 0.88);
 }
 .panel-monitor-page {
-  border-radius: 0px;
+  border-radius: 6px;
   box-shadow: 0 1px 1px rgba(8, 8, 8, 0.88);
 }
 .panel-learner-page-title,
@@ -179,7 +179,7 @@
   min-height: 48px;
 }
 .panel-admin-page {
-  border-radius: 0px;
+  border-radius: 6px;
   box-shadow: 0 1px 1px rgba(8, 8, 8, 0.88);
   margin-top: 20px;
 }
@@ -467,6 +467,11 @@
     padding: 8px 15px 8px 15px;
 }
 
+.modal .ui-resizable-handle.ui-resizable-s {
+	border-radius: 6px;
+    border-bottom: 1px solid white;
+}
+
 .table-no-border>thead>tr>th, 
 .table-no-border>tbody>tr>th, 
 .table-no-border>tfoot>tr>th, 
@@ -534,7 +539,7 @@
 	
 	/* darker outline than usual */
 	nav.sidebar{
-		  border-radius: 0px;
+		  border-radius: 6px;
 		  box-shadow: 0 1px 1px rgba(8, 8, 8, 0.88);
 		  min-height:300px;
 	}
Index: lams_central/web/css/main.css
===================================================================
RCS file: /usr/local/cvsroot/lams_central/web/css/Attic/main.css,v
diff -u -r1.1.2.15 -r1.1.2.16
--- lams_central/web/css/main.css	18 Feb 2017 16:22:22 -0000	1.1.2.15
+++ lams_central/web/css/main.css	8 Mar 2017 21:31:11 -0000	1.1.2.16
@@ -75,6 +75,7 @@
 	width: 100%;
 	font-size: 75%;
 	background-color: #FFF;
+	border-radius: 0 0 6px 6px;
 }
 a {
     color: #5A738E; 
@@ -190,25 +191,28 @@
 	line-height: 1em;
 }
 /*TOP HEADER*/
-.nav_menu {
-    float: left;
+.top-nav {
     background: #EDEDED;
     border-bottom: 1px solid #D9DEE4;
-    margin-bottom: 10px;
-    width: 100%;
+    border-radius: 6px 6px 0 0;
+    height: 53px;
 }
 .offcanvas-toggle-header {
     float: left;
     margin: 0;
     padding: 15px 0 10px 7px;
     width: 70px;
     cursor: pointer;
+    border-radius: 3px;
 }
 @media (min-width: 768px) {
 	.offcanvas-toggle-header {
 	    padding-top: 20px;
 	    padding-bottom: 15px;
 	}
+	.top-nav {
+		height: 63px;
+	}
 }
 .offcanvas-toggle-header i {
     padding: 0 15px 0;
@@ -218,25 +222,26 @@
 .offcanvas-toggle i {
     font-size: 26px;
 }
-.top_nav .navbar-right {
+.top-nav .navbar-right {
     margin: 0;
     width: 70%;
     float: right;
 }
-.top_nav .navbar-right li {
+.top-nav .navbar-right li {
     display: inline-block;
     float: right;
     position: static;
+    border-radius: 3px;
 }
 @media (min-width: 480px) {
-  .top_nav .navbar-right li {
+  .top-nav .navbar-right li {
     position: relative; 
   } 
 }
-.top_nav .dropdown-menu li {
+.top-nav .dropdown-menu li {
     width: 100%;
 }
-.top_nav li a i {
+.top-nav li a i {
 	font-size: 15px;
 }
 ul.dropdown-usermenu li {
@@ -248,42 +253,43 @@
 }
 
 /*TOP HEADER LINKS*/
-.offcanvas-toggle-header:hover, ul.dropdown-usermenu li a:focus, ul.dropdown-usermenu li a:hover, .top_nav .nav > li > a:hover, .top_nav .nav .open > a, .top_nav .nav .open > a:focus, .top_nav .nav .open > a:hover {
+.offcanvas-toggle-header:hover, ul.dropdown-usermenu li a:focus, ul.dropdown-usermenu li a:hover, .top-nav .nav > li > a:hover, .top-nav .nav .open > a, .top-nav .nav .open > a:focus, .top-nav .nav .open > a:hover {
     background: #D9DEE4;
 }
 .nav > li > a:hover, .nav > li > a:focus {
     background-color: transparent;
 }
 .navbar-nav > li > a {
     font-weight: 500;
-    color: #ECF0F1 !important;
+    color: #515356 !important;
     margin-left: 0 !important;
     line-height: 32px;
+    border-radius: 3px;
 }
-.top_nav .dropdown-menu li a {
+.top-nav .dropdown-menu li a {
     width: 100%;
     padding: 10px 20px;
+    border-radius: 3px;
 }
-.top_nav .dropdown-menu li a i {
+.top-nav .dropdown-menu li a i {
     padding-right: 15px;
 }
 .dropdown-menu a {
     cursor: pointer;
+    border-radius: 6px;
 }
 .navbar-nav .open .dropdown-menu {
     position: absolute;
     background: #fff;
     margin-top: 0;
     padding: 0 0 3px;
     border: 1px solid #D9DEE4;
+    border-radius: 6px;
     -webkit-box-shadow: none;
     right: 0;
     left: auto;
     width: 210px;
 }
-.nav.navbar-nav > li > a {
-    color: #515356 !important;
-}
 .user-profile img {
     width: 29px;
     height: 29px;
@@ -318,7 +324,7 @@
 
 .dialogContainer .modal-body {
 	height : 100%;
-	max-height: calc(100% - 56px);
+	max-height: calc(100% - 38px);
 	padding: 0;
 }
 
Index: lams_central/web/css/thickbox.css
===================================================================
RCS file: /usr/local/cvsroot/lams_central/web/css/thickbox.css,v
diff -u -r1.2.2.6 -r1.2.2.7
--- lams_central/web/css/thickbox.css	14 Dec 2016 17:16:22 -0000	1.2.2.6
+++ lams_central/web/css/thickbox.css	8 Mar 2017 21:31:11 -0000	1.2.2.7
@@ -135,6 +135,7 @@
 	width:90%;
 	max-width: 1200px;
 	border-width: 4px 4px 2px 4px;/* to compensate TB_iframeContent's cut in height of 2px */
+	border-radius: 6px;
 }
 @media (min-width: 1330px) {
 	#navcontent ~ #TB_window {
@@ -144,4 +145,5 @@
 #TB_iframeContent {
 	height:calc(100% - 2px);
 	width:100%;
+	border-radius: 0 0 6px 6px;
 }