lib/carte/client/views/card.cjsx in carte-server-1.0.7 vs lib/carte/client/views/card.cjsx in carte-server-1.0.8
- old
+ new
@@ -27,34 +27,60 @@
showTools: ()->
helpers.isMobile() || @state.showTools
render: ->
- <div className='col-sm-4 col-xs-12 list-group' onMouseOver={@onMouseOver} onMouseLeave={@onMouseLeave}>
- <div className='list-group-item'>
+ context = @props.card.query.context
+ <div
+ className={
+ classnames(
+ 'list-group',
+ 'col-sm-4': context != 'none',
+ 'col-xs-12': context != 'none',
+ 'col-sm-12': context == 'none'
+ )
+ }
+ onMouseOver={@onMouseOver}
+ onMouseLeave={@onMouseLeave}
+ >
+ <div className={classnames('list-group-item', 'carte-card-height': context != 'none')}>
<div className="carte-card-header">
{
- if @props.card.get('focused')
+ if @props.card.get('focused') || @props.card.query.context == 'none'
<i className='glyphicon glyphicon-star' />
}
<strong>
{@props.card.get('title')}
</strong>
- <span className={classnames('pull-right': true, 'tools': true, 'carte-hidden': !@showTools())}>
- <ModalTrigger modal={<Edit card={@props.card} />}>
- <a href="javascript:void(0)">
- <i className='glyphicon glyphicon-edit' />
- </a>
- </ModalTrigger>
-
-
- <a href={'#/' + encodeURIComponent(@props.card.get('title'))}>
- <i className='glyphicon glyphicon-link' />
- </a>
- </span>
+ {
+ if @props.card.modelName == 'Card'
+ <span className={classnames('pull-right': true, 'tools': true, 'carte-hidden': !@showTools())}>
+ <ModalTrigger modal={<Edit card={@props.card} />}>
+ <a href="javascript:void(0)">
+ <i className='glyphicon glyphicon-edit' />
+ </a>
+ </ModalTrigger>
+
+
+ <a href={'#/' + encodeURIComponent(@props.card.get('title'))}>
+ <i className='glyphicon glyphicon-link' />
+ </a>
+ </span>
+ else
+ <span className={classnames('pull-right': true)}>
+ <i className="fa fa-clock-o" />
+
+ {@props.card.get('version')}
+ </span>
+ }
</div>
<div className="carte-card-content">
- <div dangerouslySetInnerHTML={__html: markdownIt.render @props.card.get('content')} />
+ {
+ if @props.card.fetching
+ <i className='glyphicon glyphicon-refresh glyphicon-refresh-animate' />
+ else
+ <div dangerouslySetInnerHTML={__html: markdownIt.render @props.card.get('content') || ''} />
+ }
</div>
<div className={classnames('carte-hidden': !@showTools())}>
{
if @props.card.get("tags")
@props.card.get("tags").map (tag)->