Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Open sidebar
Sang D NGO
linagora.esn.most
Commits
a0eb0690
Commit
a0eb0690
authored
Apr 16, 2018
by
Tuan Tuan LE
⛅
Browse files
Merge branch 'view-improvement' into 'master'
View improvement See merge request
!12
parents
d7fd6969
cc3ee268
Changes
13
Hide whitespace changes
Inline
Side-by-side
Showing
13 changed files
with
31 additions
and
15 deletions
+31
-15
frontend/app/app.pug
frontend/app/app.pug
+2
-2
frontend/app/proposal/create/most-proposal-create.pug
frontend/app/proposal/create/most-proposal-create.pug
+1
-1
frontend/app/proposal/create/subheader/most-proposal-list-subheader.pug
...roposal/create/subheader/most-proposal-list-subheader.pug
+1
-2
frontend/app/proposal/detail/most-proposal-detail.pug
frontend/app/proposal/detail/most-proposal-detail.pug
+1
-1
frontend/app/proposal/detail/subheader/most-proposal-detail-subheader.pug
...posal/detail/subheader/most-proposal-detail-subheader.pug
+1
-2
frontend/app/proposal/form/a1/most-proposal-form-a1.pug
frontend/app/proposal/form/a1/most-proposal-form-a1.pug
+1
-1
frontend/app/proposal/form/a2/most-proposal-form-a2.pug
frontend/app/proposal/form/a2/most-proposal-form-a2.pug
+1
-1
frontend/app/proposal/form/a3/most-proposal-form-a3.pug
frontend/app/proposal/form/a3/most-proposal-form-a3.pug
+1
-1
frontend/app/proposal/form/form.less
frontend/app/proposal/form/form.less
+3
-0
frontend/app/proposal/list/item/most-proposal-list-item.pug
frontend/app/proposal/list/item/most-proposal-list-item.pug
+3
-4
frontend/app/proposal/most-proposal.less
frontend/app/proposal/most-proposal.less
+1
-0
frontend/app/subheader/most-subheader-back-button.component.js
...end/app/subheader/most-subheader-back-button.component.js
+9
-0
frontend/app/subheader/most-subheader-back-button.pug
frontend/app/subheader/most-subheader-back-button.pug
+6
-0
No files found.
frontend/app/app.pug
View file @
a0eb0690
.most-root.full-width.row.no-padding-xs(sub-header-aware)
most-mode-indicator
.col-md-3.hidden-xs
.col-md-3.
col-xl-2.
hidden-xs
most-sidebar
.col-xs-12.col-
md-8
.no-padding-xs
.col-md-9
.col-xs-12.col-
xl-10
.no-padding-xs
.ui-view(name="root", noanimation)
frontend/app/proposal/create/most-proposal-create.pug
View file @
a0eb0690
sub-header
most-proposal-create-subheader
.card
.card-body
.card-body
.p-20
form(name="form")
.flex.flex-vertical-centered
h4 Chọn mẫu
...
...
frontend/app/proposal/create/subheader/most-proposal-list-subheader.pug
View file @
a0eb0690
extends /modules/subheader/responsive-subheader.pug
block left
most-subheader-burger-button.hidden-md
i.mdi.mdi-menu
group-subheader-back-button
span.title.ellipsis #{__('Tạo đề xuất')}
frontend/app/proposal/detail/most-proposal-detail.pug
View file @
a0eb0690
...
...
@@ -6,7 +6,7 @@ sub-header
)
.card
.card-body.p-20
.
row
(ng-switch="$ctrl.proposal.type")
.
form-container
(ng-switch="$ctrl.proposal.type")
most-proposal-form-a1(ng-switch-when="A1", data="$ctrl.proposal.formJson", editMode="false")
most-proposal-form-a2(ng-switch-when="A2", data="$ctrl.proposal.formJson", editMode="false")
most-proposal-form-a3(ng-switch-when="A3", data="$ctrl.proposal.formJson", editMode="false")
frontend/app/proposal/detail/subheader/most-proposal-detail-subheader.pug
View file @
a0eb0690
extends /modules/subheader/responsive-subheader.pug
block left
most-subheader-burger-button.hidden-md
i.mdi.mdi-menu
most-subheader-back-button
span.title.ellipsis {{::$ctrl.title}}
block right
...
...
frontend/app/proposal/form/a1/most-proposal-form-a1.pug
View file @
a0eb0690
ng-form(name="form")
ng-form
.most-proposal-form
(name="form")
.row
.col-md-12
esn-form-group(label=__('Tên Đề tài/Đề án'))
...
...
frontend/app/proposal/form/a2/most-proposal-form-a2.pug
View file @
a0eb0690
ng-form(name="form")
ng-form
.most-proposal-form
(name="form")
.row
.col-md-12
esn-form-group(label=__('Tên dự án'))
...
...
frontend/app/proposal/form/a3/most-proposal-form-a3.pug
View file @
a0eb0690
ng-form(name="form")
ng-form
.most-proposal-form
(name="form")
.row
.col-md-12
esn-form-group(label=__('Tên Đề tài/Đề án'))
...
...
frontend/app/proposal/form/form.less
0 → 100644
View file @
a0eb0690
.most-proposal-form {
padding: 20px;
}
frontend/app/proposal/list/item/most-proposal-list-item.pug
View file @
a0eb0690
.row
.row
.clickable(ui-sref="most.proposal.detail({proposalId: $ctrl.proposal.id})")
.col-xs-6
h5.ellipsis.clickable(
title="{{::$ctrl.proposal.formJson.title}}",
ui-sref="most.proposal.detail({proposalId: $ctrl.proposal.id})"
h5.ellipsis(
title="{{::$ctrl.proposal.formJson.title}}"
) {{::$ctrl.proposal.formJson.title}}
.col-xs-1
span.ellipsis(title="{{::$ctrl.proposal.type}}") {{::$ctrl.proposal.type}}
...
...
frontend/app/proposal/most-proposal.less
View file @
a0eb0690
@import './create/most-proposal-create';
@import './list/item/most-proposal-list-item';
@import './form/form';
frontend/app/subheader/most-subheader-back-button.component.js
0 → 100644
View file @
a0eb0690
(
function
(
angular
)
{
'
use strict
'
;
angular
.
module
(
'
linagora.esn.most
'
)
.
component
(
'
mostSubheaderBackButton
'
,
{
templateUrl
:
'
/linagora.esn.most/app/subheader/most-subheader-back-button.html
'
});
})(
angular
);
frontend/app/subheader/most-subheader-back-button.pug
0 → 100644
View file @
a0eb0690
button.btn.btn-link.hidden-xs(href='', esn-back-button='most.proposal')
.flex-vertical-centered
i.mdi.mdi-arrow-left.mdi-margin-right
span #{__('Back')}
button.btn.btn-link.btn-icon.visible-xs(href='', esn-back-button='most.proposal')
i.mdi.mdi-arrow-left
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment