Skip to content

image displaying functionality, plus Chinese translation revision #139

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

image displaying functionality, plus Chinese translation revision #139

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f5b58d0
add helper to display image in listview
zoeeer Nov 21, 2017
bac2529
revise Chinese translation
zoeeer Nov 21, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions config/lang/cn.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
"views" : "Views",
"others" : "其它",

"select" : "对",
"select" : "选择",
"to-change" : "进行修改",
"filter" : "按条件过滤",
"clear" : "清除",
Expand All @@ -33,14 +33,14 @@
"or" : "或",
"today" : "今天",

"add-another" : "载追加",
"add-another" : "添加",
"remove" : "移除",
"add" : "增加",
"change" : "修改",
"delete" : "删除",
"save" : "保存",
"save-continue" : "保存然后继续修改",
"save-add" : "保存然后增加",
"save-continue" : "保存并继续编辑本条",
"save-add" : "保存并添加下一条",

"success" : "成功",
"error" : "错误",
Expand Down
1 change: 1 addition & 0 deletions lib/data/list.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@ exports.get = function (args, done) {
var value = rows[i][columns[j].name];
value = format.list.value(columns[j], value);
if (columns[j].manyToMany && value) value = {mtm: value.split(',')}
if (columns[j].control.image && value) value = {file: {img: value}};
values.push(value);
}
records.push({pk: pk, values: values});
Expand Down
12 changes: 10 additions & 2 deletions views/listview.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,8 +42,16 @@ <h2>
{{/pk}}
{{#values}}
<td>
{{^mtm}}{{.}}{{/mtm}}
{{#mtm}}<span class="label label-default">{{.}}</span>{{/mtm}}
{{^file}}
{{^mtm}}{{.}}{{/mtm}}
{{#mtm}}<span class="label label-default">{{.}}</span>{{/mtm}}
{{/file}}
{{#file}}
{{#img}}
{{^mtm}}<span type="image">{{img}}</span>{{/mtm}}
{{#mtm}}<span type="image" class="label label-default">{{.}}</span>{{/mtm}}
{{/img}}
{{/file}}
</td>
{{/values}}
</tr>
Expand Down