Better supplier section view
This commit is contained in:
@@ -4,7 +4,7 @@
|
||||
view Qsupplier.App.SectionTabHeaderView context=section
|
||||
.section-manage-tables.pull-right
|
||||
if editmode
|
||||
.btn-group
|
||||
/.btn-group
|
||||
/a.btn.dropdown-toggle data-toggle="dropdown" href="#section-background"
|
||||
span Background
|
||||
span.caret
|
||||
@@ -12,11 +12,11 @@
|
||||
each texture in textures
|
||||
li
|
||||
a{ action setTexture texture } {{texture}}
|
||||
.btn-group
|
||||
button.btn.dropdown-toggle data-toggle="dropdown"
|
||||
a.tiny.button.dropdown href="#" data-dropdown="section-action-list" Action
|
||||
/button.btn.dropdown-toggle data-toggle="dropdown"
|
||||
span Action
|
||||
span.caret
|
||||
ul#section-actions.dropdown-menu
|
||||
ul#section-action-list.f-dropdown data-dropdown-content=true
|
||||
li
|
||||
a{action addTables} {{t 'section.add_tables.button_label'}}
|
||||
li
|
||||
@@ -32,5 +32,4 @@
|
||||
a.section-normal-mode-button{ action finishEditable }: span
|
||||
else
|
||||
a.section-edit-mode-button{ action makeEditable }: span
|
||||
each table in tables
|
||||
view 'Qsupplier.App.SectionTableView' contentBinding="table"
|
||||
Qsupplier.App.SectionTablesView contentBinding="tables"
|
||||
|
||||
@@ -0,0 +1,2 @@
|
||||
each table in tables
|
||||
Qsupplier.App.SectionTableView contentBinding="table"
|
||||
@@ -15,7 +15,7 @@ div class="table-actions table-actions-#{unbound table.id}"
|
||||
a href="suppliers_table_path(@table)" {{t 'section.tables_view.table_actions.got_to_table'}}
|
||||
each user in table.active_list.users
|
||||
img src=user.facebook_image
|
||||
if editmode
|
||||
if editmodedisabled
|
||||
.table-settings
|
||||
select
|
||||
option Round
|
||||
|
||||
@@ -52,7 +52,7 @@ Qsupplier.App.SectionTableView = Ember.View.extend DragNDrop.Draggable,
|
||||
#@$('.table-actions .title').remove()
|
||||
content.hide()
|
||||
@$el.on 'click', =>
|
||||
content.toggle()
|
||||
content.toggle() if @$el.hasClass('occupied')
|
||||
#@$el.qtip
|
||||
#content:
|
||||
#text: content
|
||||
|
||||
+3
-1
@@ -1,5 +1,6 @@
|
||||
Qsupplier.App.SectionView = Ember.View.extend DragNDrop.Droppable,
|
||||
Qsupplier.App.SectionTablesView = Ember.View.extend DragNDrop.Droppable,
|
||||
classNames: ['well', 'section-tables-container', 'section-tables-active']
|
||||
templateName: 'section_tables'
|
||||
didInsertElement: ->
|
||||
@$el = $(@get('element'))
|
||||
height = @$el.width() * @get('controller.model.height') / @get('controller.model.width')
|
||||
@@ -12,6 +13,7 @@ Qsupplier.App.SectionView = Ember.View.extend DragNDrop.Droppable,
|
||||
height = @$el.width() * @get('controller.model.height') / @get('controller.model.width')
|
||||
@$el.css('height', height)
|
||||
).observes('controller.model.height', 'controller.model.width')
|
||||
tables: (->@get('content')).property('content')
|
||||
didInsertElement: ->
|
||||
# the first observable event is triggered without the container having its dimensions
|
||||
@get('controller.model').notifyPropertyChange('width').notifyPropertyChange('height')
|
||||
@@ -1,6 +1,8 @@
|
||||
//= require jquery
|
||||
//= require jquery_ujs
|
||||
//= require jquery.ui.sortable
|
||||
//= require vendor/modernizr
|
||||
//= require foundation
|
||||
//= require js-routes
|
||||
//= require translations
|
||||
//= require qwaiter
|
||||
@@ -18,6 +20,8 @@ var Qstorage = localStorage;
|
||||
$.extend($translations.en, <%= I18n.t('supplier', locale: :en).to_json %>);
|
||||
$.extend($translations.nl, <%= I18n.t('supplier', locale: :nl).to_json %>);
|
||||
|
||||
$(document).foundation();
|
||||
|
||||
String.prototype.capitalize = function() {
|
||||
return this.charAt(0).toUpperCase() + this.slice(1);
|
||||
}
|
||||
|
||||
@@ -1,9 +1,27 @@
|
||||
.section-title
|
||||
font-size: 24px
|
||||
padding: 4px 0px
|
||||
.section-tables-container
|
||||
.section-manage-tables
|
||||
.section-manage-tables
|
||||
margin: -32px 6px 4px 6px
|
||||
min-width: 470px
|
||||
text-align: right
|
||||
.section-edit-title-field
|
||||
display: inline-block
|
||||
width: 120px
|
||||
.section-edit-width-field
|
||||
display: inline-block
|
||||
width: 40px
|
||||
.section-edit-height-field
|
||||
display: inline-block
|
||||
width: 40px
|
||||
#section-action-list
|
||||
text-align: left
|
||||
.section-tables-container
|
||||
$section-border: 1px solid black
|
||||
border-left: $section-border
|
||||
border-right: $section-border
|
||||
border-bottom: $section-border
|
||||
border: $section-border
|
||||
.section-table
|
||||
background-color: #ccc
|
||||
//TODO remove width and height for ember control
|
||||
|
||||
@@ -1,6 +1,8 @@
|
||||
.dashboard-section-selection
|
||||
float: right
|
||||
white-space: nowrap
|
||||
min-width: 124px
|
||||
select
|
||||
width: calc(100% - 30px)
|
||||
.active-lists-table
|
||||
width: 100%
|
||||
.mark_list_as_helped
|
||||
|
||||
@@ -9,8 +9,10 @@
|
||||
font-weight: bold
|
||||
background-color: rgba(200,200,200,0.4)
|
||||
color: #333
|
||||
margin-bottom: 2px
|
||||
&.active
|
||||
border-bottom-width: 0
|
||||
margin-top: 2px
|
||||
&.table-hover, &.table-dragging
|
||||
background-size: 100px
|
||||
background-position: center center
|
||||
|
||||
Reference in New Issue
Block a user