Commit a0eb0690 authored by Tuan Tuan LE's avatar Tuan Tuan LE
Browse files

Merge branch 'view-improvement' into 'master'

View improvement

See merge request !12
parents d7fd6969 cc3ee268
.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)
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
......
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')}
......@@ -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")
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
......
ng-form(name="form")
ng-form.most-proposal-form(name="form")
.row
.col-md-12
esn-form-group(label=__('Tên Đề tài/Đề án'))
......
ng-form(name="form")
ng-form.most-proposal-form(name="form")
.row
.col-md-12
esn-form-group(label=__('Tên dự án'))
......
ng-form(name="form")
ng-form.most-proposal-form(name="form")
.row
.col-md-12
esn-form-group(label=__('Tên Đề tài/Đề án'))
......
.most-proposal-form {
padding: 20px;
}
.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}}
......
@import './create/most-proposal-create';
@import './list/item/most-proposal-list-item';
@import './form/form';
(function(angular) {
'use strict';
angular.module('linagora.esn.most')
.component('mostSubheaderBackButton', {
templateUrl: '/linagora.esn.most/app/subheader/most-subheader-back-button.html'
});
})(angular);
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
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment