Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

CHE-4942: fix text overlapping on Configure Actions on Factory details page. #4944

Merged
merged 1 commit into from
Apr 28, 2017
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -14,43 +14,46 @@
che-place-holder="Enter value"
aria-label="Enter value"
required
ng-maxlength="255"
ng-model="factoryActionBoxCtrl.selectedParam">
<div ng-message="required">Param is required.</div>
<div ng-message="maxlength">The value has to be less than 255 characters long.</div>
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

doest it require as well md-maxlength ?

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

minor issue: is the length is 255 or 256 ? it seems sometimes we have 256 and sometimes 255 (as message is less than, it doesn't include equals)

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

doest it require as well md-maxlength ?

AFAIK, directive ngMaxlength adds maxlength validator to ngModel,
so, it doesn't require any other validator

255 or 256

I've tried to add action with length equal 256 symbols and got the error.

Copy link
Contributor

@olexii4 olexii4 Apr 29, 2017

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

</che-input>
</div>
<che-button-primary che-button-title="Add"
ng-click="factoryActionBoxCtrl.addAction()"
ng-disabled="actionsForm.$invalid"></che-button-primary>
</div>

<div ng-if="factoryActionBoxCtrl.factoryObject.ide.onProjectsLoaded.actions.length > 0"
class="factory-actions-list">
<che-list>
<che-list-item ng-repeat="action in factoryActionBoxCtrl.factoryObject.ide.onProjectsLoaded.actions"
flex-gt-sm="100" flex-sm="33">
<div layout="row" flex>
<div layout="column"
layout-align="start start"
class="factory-actions-row-action-name">
<span>{{action.id}}</span>
</div>
<div flex layout-align="start start"
class="factory-actions-row-action-param"
ng-click="factoryActionBoxCtrl.editAction($event, $index)">
{{action.properties.name ? action.properties.name : action.properties.file}}
</div>
<div flex="10" layout="row" layout-align="center start"
class="che-list-actions">
<div ng-click="factoryActionBoxCtrl.removeAction($index)" class="factory-commands-widget-actions">
<span class="fa fa-times-circle"></span>
<md-content md-scroll-y flex class="factory-actions-list">
<div ng-if="factoryActionBoxCtrl.factoryObject.ide.onProjectsLoaded.actions.length > 0">
<che-list>
<che-list-item ng-repeat="action in factoryActionBoxCtrl.factoryObject.ide.onProjectsLoaded.actions"
flex-gt-sm="100" flex-sm="33">
<div layout="row" flex>
<div layout="column"
layout-align="start start"
class="factory-actions-row-action-name">
<span>{{action.id}}</span>
</div>
<div flex layout-align="start start"
class="factory-actions-row-action-param"
ng-click="factoryActionBoxCtrl.editAction($event, $index)">
{{action.properties.name ? action.properties.name : action.properties.file}}
</div>
<div ng-click="factoryActionBoxCtrl.editAction($event, $index)" class="factory-commands-widget-actions">
<span class="fa fa-edit"></span>
<div flex="10" layout="row" layout-align="center start"
class="che-list-actions">
<div ng-click="factoryActionBoxCtrl.removeAction($index)" class="factory-commands-widget-actions">
<span class="fa fa-times-circle"></span>
</div>
<div ng-click="factoryActionBoxCtrl.editAction($event, $index)" class="factory-commands-widget-actions">
<span class="fa fa-edit"></span>
</div>
</div>
</div>
</div>
</che-list-item>
</che-list>
</div>
</che-list-item>
</che-list>
</div>
</md-content>
</div>
</form>
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@
margin-right 20px

.factory-actions-list
max-height 500px
max-width 600px

md-list
Expand All @@ -34,6 +35,8 @@
min-height 100%
cursor pointer
outline none
margin-right 0
margin-left 10px

span
line-height inherit
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
ng-click="factoryActionDialogEditCtrl.abort()">
</che-button-notice>
<che-button-primary
che-button-title="Edit" ng-disabled="editActionForm.$invalid"
che-button-title="Save" ng-disabled="editActionForm.$invalid"
ng-click="factoryActionDialogEditCtrl.edit()"></che-button-primary>
</form>
</che-popup>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
ng-click="factoryCommandDialogEditCtrl.abort()">
</che-button-notice>
<che-button-primary
che-button-title="Edit" ng-disabled="editActionForm.$invalid"
che-button-title="Save" ng-disabled="editActionForm.$invalid"
ng-click="factoryCommandDialogEditCtrl.edit()"></che-button-primary>
</form>
</che-popup>
Original file line number Diff line number Diff line change
Expand Up @@ -39,36 +39,37 @@
ng-disabled="commandsForm.$invalid"></che-button-primary>
</div>

<div ng-if="factoryCommandCtrl.factoryObject.workspace.commands.length > 0"
class="factory-commands-list">
<che-list>
<che-list-item ng-repeat="command in factoryCommandCtrl.factoryObject.workspace.commands"
flex="100">
<div layout="row" flex>
<div layout="column"
layout-align="start start"
class="factory-commands-row-command-name">
<span>{{command.name}}</span>
</div>
<div flex
layout="column"
layout-align="start start"
ng-click="factoryCommandCtrl.editCommand($event, $index)"
class="factory-commands-row-command">
{{command.commandLine}}
</div>
<div flex="10" layout="row" layout-align="center start"
class="che-list-actions">
<div ng-click="factoryCommandCtrl.removeCommand($index)" class="factory-commands-widget-actions">
<span class="fa fa-times-circle"></span>
<md-content md-scroll-y flex class="factory-commands-list">
<div ng-if="factoryCommandCtrl.factoryObject.workspace.commands.length > 0">
<che-list>
<che-list-item ng-repeat="command in factoryCommandCtrl.factoryObject.workspace.commands"
flex="100">
<div layout="row" flex>
<div layout="column"
layout-align="start start"
class="factory-commands-row-command-name">
<span>{{command.name}}</span>
</div>
<div flex
layout="column"
layout-align="start start"
ng-click="factoryCommandCtrl.editCommand($event, $index)"
class="factory-commands-row-command">
{{command.commandLine}}
</div>
<div ng-click="factoryCommandCtrl.editCommand($event, $index)" class="factory-commands-widget-actions">
<span class="fa fa-edit"></span>
<div flex="10" layout="row" layout-align="center start"
class="che-list-actions">
<div ng-click="factoryCommandCtrl.removeCommand($index)" class="factory-commands-widget-actions">
<span class="fa fa-times-circle"></span>
</div>
<div ng-click="factoryCommandCtrl.editCommand($event, $index)" class="factory-commands-widget-actions">
<span class="fa fa-edit"></span>
</div>
</div>
</div>
</div>
</che-list-item>
</che-list>
</div>
</che-list-item>
</che-list>
</div>
</md-content>
</div>
</form>
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@
margin-right 20px

.factory-commands-list
max-height 500px
max-width 600px

md-list
Expand All @@ -33,6 +34,8 @@
min-height 100%
cursor pointer
outline none
margin-right 0
margin-left 10px

span
line-height inherit
Expand Down