@@ -328,13 +328,13 @@ div#freeze { | |||||
.avatar { | .avatar { | ||||
display: inline-block; | display: inline-block; | ||||
vertical-align: middle; | vertical-align: middle; | ||||
border-radius: 50%; | |||||
overflow: hidden; | overflow: hidden; | ||||
background-color: #ddd; | |||||
border: 1px solid #eee; | |||||
} | } | ||||
.avatar img { | .avatar img { | ||||
background-color: #ddd; | |||||
border: 1px solid #eee; | |||||
border-radius: 50%; | |||||
width: 100%; | width: 100%; | ||||
height: auto; | height: auto; | ||||
} | } | ||||
@@ -342,19 +342,13 @@ div#freeze { | |||||
.avatar-small { | .avatar-small { | ||||
margin-right: 5px; | margin-right: 5px; | ||||
width: 30px; | width: 30px; | ||||
} | |||||
.avatar-small img { | |||||
max-height: 30px; | |||||
height: 30px; | |||||
} | } | ||||
.avatar-large { | .avatar-large { | ||||
margin-right: 10px; | margin-right: 10px; | ||||
width: 72px; | width: 72px; | ||||
} | |||||
.avatar-large img { | |||||
max-height: 72px; | |||||
height: 30px; | |||||
} | } | ||||
/* slickgrid */ | /* slickgrid */ | ||||
@@ -457,14 +451,17 @@ textarea[data-fieldtype="Small Text"] { | |||||
display: inline; | display: inline; | ||||
} | } | ||||
.hidden-sm-inline { | |||||
.hidden-xs-inline, .hidden-xs-inline-block { | |||||
display: none; | display: none; | ||||
} | } | ||||
@media (min-width: 768px) { | @media (min-width: 768px) { | ||||
.hidden-sm-inline { | |||||
.hidden-xs-inline { | |||||
display: inline; | display: inline; | ||||
} | } | ||||
.hidden-xs-inline-block { | |||||
display: inline-block; | |||||
} | |||||
} | } | ||||
.modal-backdrop { | .modal-backdrop { | ||||
@@ -23,7 +23,7 @@ wn.ui.AppFrame = Class.extend({ | |||||
<div class="status-bar"></div>\ | <div class="status-bar"></div>\ | ||||
</div>\ | </div>\ | ||||
</div>\ | </div>\ | ||||
<div class="info-bar" style="display: none;"><ul class="hidden-sm-inline"></ul></div>\ | |||||
<div class="info-bar" style="display: none;"><ul class="hidden-xs-inline"></ul></div>\ | |||||
<div class="appframe-toolbar" style="display: none;">\ | <div class="appframe-toolbar" style="display: none;">\ | ||||
</div>\ | </div>\ | ||||
<div>').prependTo(parent); | <div>').prependTo(parent); | ||||
@@ -212,7 +212,7 @@ wn.ui.AppFrame = Class.extend({ | |||||
var append_or_prepend = is_title ? "prependTo" : "appendTo"; | var append_or_prepend = is_title ? "prependTo" : "appendTo"; | ||||
this.buttons[label] = $(repl('<button class="btn btn-default">\ | this.buttons[label] = $(repl('<button class="btn btn-default">\ | ||||
%(icon)s <span class="hidden-sm-inline">%(label)s</span></button>', args)) | |||||
%(icon)s <span class="hidden-xs-inline">%(label)s</span></button>', args)) | |||||
[append_or_prepend](this.toolbar.find(".btn-group").css({"margin-right": "5px"})) | [append_or_prepend](this.toolbar.find(".btn-group").css({"margin-right": "5px"})) | ||||
.attr("title", wn._(label)) | .attr("title", wn._(label)) | ||||
.click(click); | .click(click); | ||||
@@ -159,16 +159,20 @@ wn.views.ListView = Class.extend({ | |||||
// row #2 | // row #2 | ||||
var row2 = $('<div class="row">\ | var row2 = $('<div class="row">\ | ||||
<div class="col-xs-12">\ | <div class="col-xs-12">\ | ||||
<div class="col-xs-7 col-md-offset-3">\ | |||||
<div class="list-tag hidden-sm hidden-xs"></div></div>\ | |||||
<div class="col-xs-2 timestamp" style="font-size: 90%; padding-right: 4px;\ | |||||
color: #aaa; margin-top: -3px; text-align: right;">\ | |||||
<div class="col-xs-3"></div>\ | |||||
<div class="col-xs-7">\ | |||||
<div class="list-tag hidden-xs"></div>\ | |||||
<div class="list-last-modified visible-xs text-muted small"></div>\ | |||||
</div>\ | |||||
<div class="col-xs-2 timestamp small text-muted" style="padding-right: 4px;\ | |||||
margin-top: -3px; text-align: right;">\ | |||||
</div>\ | </div>\ | ||||
</div>\ | </div>\ | ||||
</div>').appendTo(row); | </div>').appendTo(row); | ||||
// modified | // modified | ||||
row2.find(".timestamp").html(comment_when(data.modified)); | row2.find(".timestamp").html(comment_when(data.modified)); | ||||
row2.find(".list-last-modified").html(wn._("Last updated by") + ": " + wn.user_info(data.modified_by).fullname); | |||||
// add tags | // add tags | ||||
var tag_editor = new wn.ui.TagEditor({ | var tag_editor = new wn.ui.TagEditor({ | ||||
@@ -241,6 +245,7 @@ wn.views.ListView = Class.extend({ | |||||
+ wn.user_info(data.modified_by).fullname)) | + wn.user_info(data.modified_by).fullname)) | ||||
.appendTo($(parent).css({"margin-top": "-5px"})) | .appendTo($(parent).css({"margin-top": "-5px"})) | ||||
.css({"max-width": "100%"}) | .css({"max-width": "100%"}) | ||||
.addClass("hidden-xs-inline-block") | |||||
} | } | ||||
else if(opts.content=='check') { | else if(opts.content=='check') { | ||||
} | } | ||||