Merge branch 'master' of github.com:Evolveum/midpoint

Evolveum · Oct 13, 2015 · 29481da · 29481da
2 parents e4cb35b + 3a6b1f9
commit 29481da
Show file tree

Hide file tree

Showing 6 changed files with 25 additions and 32 deletions.
diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/data/PageSizePopover.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/data/PageSizePopover.java
@@ -34,9 +34,12 @@ public PageSizePopover(String id) {
     public void renderHead(IHeaderResponse response) {
         super.renderHead(response);
 
+        String buttonId = get(ID_POP_BUTTON).getMarkupId();
+
         StringBuilder sb = new StringBuilder();
-        sb.append("initPageSizePopover('").append(get(ID_POP_BUTTON).getMarkupId());
+        sb.append("initPageSizePopover('").append(buttonId);
         sb.append("','").append(get(ID_POPOVER).getMarkupId());
+        sb.append("','").append(buttonId);
         sb.append("');");
 
         response.render(OnDomReadyHeaderItem.forScript(sb.toString()));

diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/PageTemplate.html b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/PageTemplate.html
@@ -85,7 +85,7 @@
         <link href="../../../../../webjars/ionicons/2.0.1/css/ionicons.min.css" rel="stylesheet" type="text/css" />
         <link href="../../../../../webjars/adminlte/2.3.0/plugins/datatables/dataTables.bootstrap.css" rel="stylesheet" type="text/css" />
         <link href="../../../../../webjars/adminlte/2.3.0/dist/css/AdminLTE.min.css" rel="stylesheet" type="text/css" />
-        <link href="../../../../../webjars/adminlte/2.3.0/dist/css/skins/skin-blue.min.css" rel="stylesheet" type="text/css" />
+        <link href="../../../../../webjars/adminlte/2.3.0/dist/css/skins/skin-blue-light.min.css" rel="stylesheet" type="text/css" />
 
         <!-- HTML5 Shim and Respond.js IE8 support of HTML5 elements and media queries -->
         <!-- WARNING: Respond.js doesn't work if you view the page via file:// -->
@@ -105,7 +105,7 @@
     <!-- OBSOLETE END -->
     <link type="text/css" rel="stylesheet" href="wro/midpoint-theme.css"/>
 </head>
-<body class="skin-blue">
+<body class="skin-blue-light">
     <div class="wrapper">
         <header class="main-header">
             <!-- Logo -->

diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/reports/PageReports.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/reports/PageReports.java
@@ -114,17 +114,6 @@ protected ReportSearchDto load() {
         initLayout();
     }
 
-    @Override
-    protected IModel<String> createPageSubTitleModel(){
-        return new AbstractReadOnlyModel<String>() {
-
-            @Override
-            public String getObject() {
-                return createStringResource("page.subTitle").getString();
-            }
-        };
-    }
-
     private void initLayout() {
         Form mainForm = new Form(ID_MAIN_FORM);
         add(mainForm);

diff --git a/gui/admin-gui/src/main/resources/localization/Midpoint.properties b/gui/admin-gui/src/main/resources/localization/Midpoint.properties
@@ -1129,7 +1129,7 @@ pageAdminFocus.message.noActivationFound=No activation found for projection '{0}
 pageAdminFocus.message.noEnabledPropertyFound=No enabled property found for account '{0}'.
 pageAdminFocus.message.noAccountSelected=No projection selected.
 pageAdminFocus.message.noAssignmentSelected=No assignment selected.
-pageAdminFocus.title.selectResourceSelect resource(s)
+pageAdminFocus.title.selectResource=Select resource(s)
 pageAdminFocus.title.selectAssignable=Select object(s)
 pageAdminFocus.task.name=Task name
 pageAdminFocus.task.category=Category
@@ -2759,3 +2759,6 @@ PageSelfCredentials.passwordLabel1=Password
 PageSelfCredentials.passwordLabel2=Confirm password
 ChangePasswordPanel.accountsTable.header=Accounts
 ChangePasswordPanel.label.changeAllPasswords=Keep all passwords the same
+PageBase.button.tooltip.clearSearch=Clear
+mainForm.uploadTooLarge = Upload must be less than ${maxSize}.
+mainForm.uploadFailed = File failed to upload: ${exception.localizedMessage}
diff --git a/gui/admin-gui/src/main/webapp/js/midpoint-theme.js b/gui/admin-gui/src/main/webapp/js/midpoint-theme.js
@@ -116,17 +116,7 @@ function updateHeightReal(elementId, add, substract) {
 }
 
 /**
- * Used in PageSizePopover class, in table panel.
- *
- * @param buttonId
- * @param popoverId
- */
-function initPageSizePopover(buttonId, popoverId) {
-    console.log(popoverId);
-    initPageSizePopover(buttonId, popoverId, buttonId);
-}
-
-/**
+ * Used in TableConfigurationPanel (table page size)
  *
  * @param buttonId
  * @param popoverId

diff --git a/gui/admin-gui/src/main/webapp/less/midpoint-theme.less b/gui/admin-gui/src/main/webapp/less/midpoint-theme.less
@@ -46,11 +46,15 @@ li.dropdown.user.user-menu {
   }
 }
 
-//disabled menu css fixes
-.skin-blue .treeview-menu > li > span {
-  color: #8aa4af;
+//table context menu border fix
+th.cog, td.cog {
+  & ul.dropdown-menu.pull-right {
+    border-color: #337ab7;
+  }
 }
+//end table context menu border fix
 
+//disabled menu css fixes
 .sidebar-menu .treeview-menu > li > span {
   display: block;
   font-size: 14px;
@@ -63,10 +67,11 @@ li.dropdown.user.user-menu {
   width: 20px;
 }
 
-.skin-blue .treeview-menu > li.active > span,
-.skin-blue .treeview-menu > li > span:hover {
-  color: #fff;
+.skin-blue-light .treeview-menu > li.active > span,
+.skin-blue-light .treeview-menu > li > span:hover {
+  color: #000;
 }
+//end of disabled menu css fixes
 
 .user-thumbnail-helper {
   display: inline-block;
@@ -105,6 +110,7 @@ li.dropdown.user.user-menu {
 	white-space: nowrap;
 	text-align: center;
 	line-height: 0px;
+    border-radius: 0;
 }
 
 .info-box-icon.summary-panel-role {
@@ -114,6 +120,7 @@ li.dropdown.user.user-menu {
 	white-space: nowrap;
 	text-align: center;
 	line-height: 0px;
+    border-radius: 0;
 }
 
 .info-box-icon.summary-panel-org {
@@ -123,6 +130,7 @@ li.dropdown.user.user-menu {
 	white-space: nowrap;
 	text-align: center;
 	line-height: 0px;
+    border-radius: 0;
 }
 
 .summary-panel-identifier {