You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by pa...@apache.org on 2017/02/07 12:13:28 UTC
ambari git commit: AMBARI-19880. WFM: "Workflow Designer" title
should be changed to "Workflow Manager" and Minor UI fixes (Venkata Sairam
via pallavkul)
Repository: ambari
Updated Branches:
refs/heads/trunk 5ecc858fd -> d3ff926cc
AMBARI-19880. WFM: "Workflow Designer" title should be changed to "Workflow Manager" and Minor UI fixes (Venkata Sairam via pallavkul)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/d3ff926c
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/d3ff926c
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/d3ff926c
Branch: refs/heads/trunk
Commit: d3ff926cca55a6f3de8fa7dd4e9840424852e0ab
Parents: 5ecc858
Author: pallavkul <pa...@gmail.com>
Authored: Tue Feb 7 17:42:32 2017 +0530
Committer: pallavkul <pa...@gmail.com>
Committed: Tue Feb 7 17:42:32 2017 +0530
----------------------------------------------------------------------
.../src/main/resources/ui/app/styles/app.less | 41 ++++++++++++--------
.../templates/components/designer-workspace.hbs | 13 ++-----
.../ui/app/templates/components/help-icon.hbs | 2 +-
.../resources/ui/app/templates/dashboard.hbs | 2 +-
4 files changed, 30 insertions(+), 28 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/d3ff926c/contrib/views/wfmanager/src/main/resources/ui/app/styles/app.less
----------------------------------------------------------------------
diff --git a/contrib/views/wfmanager/src/main/resources/ui/app/styles/app.less b/contrib/views/wfmanager/src/main/resources/ui/app/styles/app.less
index 3707280..750ba62 100644
--- a/contrib/views/wfmanager/src/main/resources/ui/app/styles/app.less
+++ b/contrib/views/wfmanager/src/main/resources/ui/app/styles/app.less
@@ -29,7 +29,7 @@
@actionLinkColor: #49aebf;
@navTabAnchorColor: #777;
@navTabAnchorHighlightedColor: #555;
-
+@modalDialogWidth: 60%;
body {
background: @bgColor;
padding: 0;
@@ -76,6 +76,9 @@ a {
.marginright5{
margin-right: 5px !important;
}
+.marginright10 {
+ margin-right: 10px !important;
+}
.padding15pcnt {
padding:15%;
}
@@ -568,7 +571,6 @@ input:invalid {
}
#action_properties_dialog .modal-body {
- max-height: @defaultPropertiesEditorHeight;
overflow-y: scroll;
overflow-x: hidden;
}
@@ -584,11 +586,9 @@ input:invalid {
}
#configureJob .modal-body {
- max-height: @defaultPropertiesEditorHeight;
overflow-y: scroll;
overflow-x: hidden;
}
-
#action_properties_dialog .modal-dialog,
#workflow_sla_dialog .modal-dialog,
#global_properties_dialog .modal-dialog,
@@ -601,12 +601,15 @@ input:invalid {
#asset_manager_dialog .modal-dialog,
#asset_config_dialog .modal-dialog,
#asset_list_dialog .modal-dialog,
-#actionDetailsModal .modal-dialog {
- width: 800px;
-}
-#configureJob .modal-dialog{
- width: 650px;
+#actionDetailsModal .modal-dialog,
+#configureJob .modal-dialog,
+#asset-delete-confirm-dialog .modal-dialog,
+#projectsList .modal-dialog,
+#previewModal .modal-dialog {
+ width: @modalDialogWidth;
+height: 100vh;
}
+
#collapseOne{
margin: 10px;
}
@@ -1617,9 +1620,10 @@ input:invalid {
}
#search-table td:first-child {
width:5%;
+ height:40px;
}
#draftsTable {
- max-height:500px;
+ max-height: @defaultPropertiesEditorHeight;
overflow-y:scroll;
}
#emptyDrafts {
@@ -1665,7 +1669,6 @@ input:invalid {
min-height: 175px;
}
#asset-delete-confirm-dialog .modal-dialog{
- width: 650px;
top: 60px;
}
.action-link, .action-link:hover, .action-link:focus {
@@ -1699,15 +1702,9 @@ input:invalid {
.displayBlock {
display : block;
}
-#projectsList .modal-dialog {
- width:850px;
-}
.tab-pane #draftsTable, #projectsList #dashboard, .tab-pane .searchWorkflows {
display : none;
}
- #projectDeleteModal .modal-dialog {
- width:500px;
- }
.projects-list {
white-space: nowrap;
width: 100%;
@@ -1735,3 +1732,13 @@ input:invalid {
margin-bottom: 10px;
margin-right: 3px;
}
+ .modal {
+ height: 90vh;
+ }
+ .modal-body {
+ max-height:70vh;
+ overflow:scroll;
+ }
+ .CodeMirror{
+ height: auto;
+ }
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/ambari/blob/d3ff926c/contrib/views/wfmanager/src/main/resources/ui/app/templates/components/designer-workspace.hbs
----------------------------------------------------------------------
diff --git a/contrib/views/wfmanager/src/main/resources/ui/app/templates/components/designer-workspace.hbs b/contrib/views/wfmanager/src/main/resources/ui/app/templates/components/designer-workspace.hbs
index 0bd7195..b29ae21 100644
--- a/contrib/views/wfmanager/src/main/resources/ui/app/templates/components/designer-workspace.hbs
+++ b/contrib/views/wfmanager/src/main/resources/ui/app/templates/components/designer-workspace.hbs
@@ -21,7 +21,7 @@
<div class="row">
<div class="col-sm-4">
<div class="navbar-brand">
- <label for="">Workflow Designer</label>
+ <label for="">Workflow Manager</label>
</div>
</div>
<div class="col-sm-8">
@@ -38,11 +38,11 @@
<li>
<a id="wfs_btn" class="pointer projects-list" title={{proj.workflowDefinitionPath}} {{action "editWorkflow" proj.workflowDefinitionPath proj.type}}>
{{#if (eq proj.type "WORKFLOW")}}
- <i class="fa fa-sitemap marginright5"></i>{{proj.name}}
+ <i class="fa fa-sitemap marginright10"></i><span class="action-link">{{proj.name}}</span>
{{else if (eq proj.type "COORDINATOR")}}
- <i class="fa fa-history marginright5"></i>{{proj.name}}
+ <i class="fa fa-history marginright10"></i><span class="action-link">{{proj.name}}</span>
{{else}}
- <i class="fa fa-cubes marginright5"></i>{{proj.name}}
+ <i class="fa fa-cubes marginright10"></i><span class="action-link">{{proj.name}}</span>
{{/if}}
</a>
</li>
@@ -98,11 +98,6 @@
<button {{action "showAssetManager" true}} class="btn btn-default" title="Manage Assets">
Manage Assets
</button>
- {{#if (eq isProjectManagerEnabled "true")}}
- <button {{action "showProjectManager" true}} class="btn btn-default" title="Project Manager">
- <i class="fa fa-folder marginright5" aria-hidden="true"></i>Projects
- </button>
- {{/if}}
{{help-icon}}
</div>
</div>
http://git-wip-us.apache.org/repos/asf/ambari/blob/d3ff926c/contrib/views/wfmanager/src/main/resources/ui/app/templates/components/help-icon.hbs
----------------------------------------------------------------------
diff --git a/contrib/views/wfmanager/src/main/resources/ui/app/templates/components/help-icon.hbs b/contrib/views/wfmanager/src/main/resources/ui/app/templates/components/help-icon.hbs
index 61893e2..e88c197 100644
--- a/contrib/views/wfmanager/src/main/resources/ui/app/templates/components/help-icon.hbs
+++ b/contrib/views/wfmanager/src/main/resources/ui/app/templates/components/help-icon.hbs
@@ -15,7 +15,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
}}
-<a href="https://oozie.apache.org/docs/4.2.0/WorkflowFunctionalSpec.html" target="_blank">
+<a href="http://docs.hortonworks.com/HDPDocuments/HDP2/HDP-2.6.0/bk_workflow-management/content/index.html" target="_blank">
<button type="button" class="btn btn-default" title="Help">
<i class="fa fa-question-circle"></i>
</button>
http://git-wip-us.apache.org/repos/asf/ambari/blob/d3ff926c/contrib/views/wfmanager/src/main/resources/ui/app/templates/dashboard.hbs
----------------------------------------------------------------------
diff --git a/contrib/views/wfmanager/src/main/resources/ui/app/templates/dashboard.hbs b/contrib/views/wfmanager/src/main/resources/ui/app/templates/dashboard.hbs
index 41a23b1..c75d1d2 100644
--- a/contrib/views/wfmanager/src/main/resources/ui/app/templates/dashboard.hbs
+++ b/contrib/views/wfmanager/src/main/resources/ui/app/templates/dashboard.hbs
@@ -24,7 +24,7 @@
<span class="navbar-brand">Workflow Dashboard</span>
<div class="navbar-brand" id="create-new-button">
<button type="button" {{action "launchDesign"}} class="btn btn-default whiteLabel">
- <i class="fa fa-sitemap marginright5"></i>Workflow Designer
+ <i class="fa fa-sitemap marginright5"></i>Workflow Manager
</button>
{{help-icon}}
</div>