Skip to content

Commit ca66ead

Browse files
committed
Show import results in the same line as the description.
1 parent edcb115 commit ca66ead

File tree

2 files changed

+53
-0
lines changed

2 files changed

+53
-0
lines changed

local/theme.css

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -144,6 +144,10 @@ pre, tt {
144144
.giInfo {
145145
}
146146

147+
.giInfo .giWarning {
148+
display: inline-block;
149+
}
150+
147151
.giSuccess, .giWarning, .giError {
148152
font-weight: bold;
149153
}
Lines changed: 49 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,49 @@
1+
{*
2+
* $Revision: 16235 $
3+
* Read this before changing templates! http://codex.gallery2.org/Gallery2:Editing_Templates
4+
*}
5+
<div class="gbBlock gcBackground1">
6+
<h2> {g->text text="Upload Complete"} </h2>
7+
</div>
8+
9+
<div class="gbBlock">
10+
<h3>
11+
{if isset($ItemAddConfirmation.count)}
12+
{g->text one="Successfully added %d file." many="Successfully added %d files."
13+
count=$ItemAddConfirmation.count arg1=$ItemAddConfirmation.count}
14+
{else}
15+
{g->text text="No files added."}
16+
{/if}
17+
</h3>
18+
19+
{foreach from=$ItemAddConfirmation.status.addedFiles item=entry}
20+
{if $entry.exists}
21+
{capture name="itemLink"}
22+
<a href="{g->url arg1="view=core.ShowItem" arg2="itemId=`$entry.id`"}">
23+
{$entry.fileName}
24+
</a>
25+
{/capture}
26+
<div class="giInfo">
27+
{g->text text="Added %s" arg1=$smarty.capture.itemLink}
28+
{else}
29+
<div class="giInfo">
30+
{g->text text="Failed to add %s" arg1=$entry.fileName}
31+
{/if}
32+
{if !empty($entry.warnings)}
33+
<div class="giWarning">
34+
{foreach from=$entry.warnings item=warning}
35+
{$warning} <br/>
36+
{/foreach}
37+
</div>
38+
{/if}
39+
</div>
40+
41+
{/foreach}
42+
</div>
43+
44+
<div class="gbBlock">
45+
<a href="{g->url arg1="view=core.ItemAdmin" arg2="subView=core.ItemAdd"
46+
arg3="itemId=`$ItemAdmin.item.id`"}">
47+
{g->text text="Add more files"}
48+
</a>
49+
</div>

0 commit comments

Comments
 (0)