mirror of
https://github.com/LaCasemate/fab-manager.git
synced 2025-02-17 11:54:22 +01:00
Merge branch 'dev'
This commit is contained in:
commit
1e5b5ae0d4
app
assets
models
views/api/projects
config
vendor/assets/stylesheets
@ -69,6 +69,7 @@ config(['$locationProvider', '$httpProvider', 'AuthProvider', "growlProvider", "
|
|||||||
|
|
||||||
$rootScope.summernoteOpts = {
|
$rootScope.summernoteOpts = {
|
||||||
lang: 'fr-FR',
|
lang: 'fr-FR',
|
||||||
|
height: 200,
|
||||||
toolbar: [
|
toolbar: [
|
||||||
['style', ['style']],
|
['style', ['style']],
|
||||||
['font', ['bold', 'italic', 'underline', 'clear']],
|
['font', ['bold', 'italic', 'underline', 'clear']],
|
||||||
|
@ -1,4 +1,10 @@
|
|||||||
|
|
||||||
|
//summernote
|
||||||
|
|
||||||
|
.note-editor .note-editable {
|
||||||
|
background-color: white;
|
||||||
|
}
|
||||||
|
|
||||||
// Growl
|
// Growl
|
||||||
.growl {
|
.growl {
|
||||||
top: 90px;
|
top: 90px;
|
||||||
|
@ -77,8 +77,8 @@
|
|||||||
<span class="label label-warning m-t m-b">Étape {{ $index+1 }}/{{project.project_steps_attributes.length}}</span>
|
<span class="label label-warning m-t m-b">Étape {{ $index+1 }}/{{project.project_steps_attributes.length}}</span>
|
||||||
<input type="hidden" name="project[project_steps_attributes][][id]" ng-value="step.id" />
|
<input type="hidden" name="project[project_steps_attributes][][id]" ng-value="step.id" />
|
||||||
<input type="hidden" name="project[project_steps_attributes][][_destroy]" ng-value="step._destroy" />
|
<input type="hidden" name="project[project_steps_attributes][][_destroy]" ng-value="step._destroy" />
|
||||||
<!-- <input ng-model="step.title" type="text" name="project[project_steps_attributes][][title]" class="form-control m-b-sm m-t-xs" placeholder="Titre de l'étape" required>
|
<input ng-model="step.title" type="text" name="project[project_steps_attributes][][title]" class="form-control m-b-sm m-t-xs" placeholder="Titre de l'étape" required>
|
||||||
<textarea name="project[project_steps_attributes][][description]" ng-model="step.description" class="m-b-sm form-control" placeholder="" rows="8" redactor></textarea> -->
|
|
||||||
|
|
||||||
<input type="hidden" name="project[project_steps_attributes][][description]" ng-value="step.description" />
|
<input type="hidden" name="project[project_steps_attributes][][description]" ng-value="step.description" />
|
||||||
<summernote ng-model="step.description" placeholder="" config="summernoteOpts" name=project[project_steps_attributes][][description] required></summernote>
|
<summernote ng-model="step.description" placeholder="" config="summernoteOpts" name=project[project_steps_attributes][][description] required></summernote>
|
||||||
|
@ -132,9 +132,15 @@
|
|||||||
</ul>
|
</ul>
|
||||||
</section>
|
</section>
|
||||||
|
|
||||||
|
<section class="widget panel b-a m" ng-if="project.licence">
|
||||||
|
<div class="panel-heading b-b">
|
||||||
|
<h3>Licence</h3>
|
||||||
|
</div>
|
||||||
|
<div class="panel-body">
|
||||||
|
{{ project.licence.name }}
|
||||||
|
</div>
|
||||||
|
</section>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
|
|
||||||
|
@ -8,7 +8,7 @@ class Project < ActiveRecord::Base
|
|||||||
has_one :project_image, as: :viewable, dependent: :destroy
|
has_one :project_image, as: :viewable, dependent: :destroy
|
||||||
accepts_nested_attributes_for :project_image, allow_destroy: true
|
accepts_nested_attributes_for :project_image, allow_destroy: true
|
||||||
has_many :project_caos, as: :viewable, dependent: :destroy
|
has_many :project_caos, as: :viewable, dependent: :destroy
|
||||||
accepts_nested_attributes_for :project_caos, allow_destroy: true
|
accepts_nested_attributes_for :project_caos, allow_destroy: true, reject_if: :all_blank
|
||||||
|
|
||||||
has_and_belongs_to_many :machines, join_table: :projects_machines
|
has_and_belongs_to_many :machines, join_table: :projects_machines
|
||||||
has_and_belongs_to_many :components, join_table: :projects_components
|
has_and_belongs_to_many :components, join_table: :projects_components
|
||||||
|
@ -54,3 +54,6 @@ json.project_steps_attributes @project.project_steps.order('project_steps.create
|
|||||||
json.project_step_image_url s.project_step_image.attachment_url if s.project_step_image
|
json.project_step_image_url s.project_step_image.attachment_url if s.project_step_image
|
||||||
end
|
end
|
||||||
json.state @project.state
|
json.state @project.state
|
||||||
|
json.licence do
|
||||||
|
json.name @project.licence.name
|
||||||
|
end if @project.licence.present?
|
||||||
|
@ -20,10 +20,10 @@ test:
|
|||||||
|
|
||||||
staging:
|
staging:
|
||||||
secret_key_base: <%= ENV["SECRET_KEY_BASE"] %>
|
secret_key_base: <%= ENV["SECRET_KEY_BASE"] %>
|
||||||
disqus_shortname: <%= ENV["DISQUS_SHORTNAME"] %>
|
disqus_shortname: fabmanager-staging
|
||||||
|
|
||||||
# Do not keep production secrets in the repository,
|
# Do not keep production secrets in the repository,
|
||||||
# instead read values from the environment.
|
# instead read values from the environment.
|
||||||
production:
|
production:
|
||||||
secret_key_base: <%= ENV["SECRET_KEY_BASE"] %>
|
secret_key_base: <%= ENV["SECRET_KEY_BASE"] %>
|
||||||
disqus_shortname: <%= ENV["DISQUS_SHORTNAME"] %>
|
disqus_shortname: fabmanager-production
|
||||||
|
826
vendor/assets/stylesheets/redactor.css
vendored
826
vendor/assets/stylesheets/redactor.css
vendored
File diff suppressed because one or more lines are too long
Loading…
x
Reference in New Issue
Block a user