Skip to content

Commit 950b1e8

Browse files
satanasovsatanasov
committed
Add archivar fixes
1 parent 043bf84 commit 950b1e8

File tree

5 files changed

+16
-17
lines changed

5 files changed

+16
-17
lines changed

‎acpcleanup/language/de/info_acp_gallery_cleanup.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,5 +75,5 @@
7575
'MOVE_TO_IMPORT' => 'Verschieben von Bildern ins Import Verzeichnis',
7676
'MOVE_TO_USER' => 'Wechseln zu Benutzer',
7777
'MOVE_TO_USER_EXP' => 'Bilder und Kommentare werden als diejenigen des Benutzers verschoben werden, die Du definiert hast. Wenn Keine ausgewählt wird - wird Gast verwendet.',
78-
'CLEAN_USER_NOT_FOUND' => 'The user you selected does not exists!',
78+
'CLEAN_USER_NOT_FOUND' => 'Der von Ihnen ausgewählte Benutzer existiert nicht!',
7979
));

‎core/album/display.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -608,7 +608,7 @@ public function display_albums($root_data = '', $display_moderators = true, $ret
608608
'ALBUM_DESC' => generate_text_for_display($row['album_desc'], $row['album_desc_uid'], $row['album_desc_bitfield'], $row['album_desc_options']),
609609
'ALBUM_FOLDER_IMG' => '',
610610
'ALBUM_FOLDER_IMG_SRC' => '',
611-
// 'ALBUM_IMAGE' => ($row['album_image']) ? $row['album_image'] : '',
611+
'ALBUM_IMAGE' => ($row['album_image']) ? $row['album_image'] : '',
612612
'U_VIEWALBUM' => $this->helper->route('phpbbgallery_core_album', array('album_id' => (int) $row['album_id'])),
613613
));
614614

@@ -737,7 +737,7 @@ public function display_albums($root_data = '', $display_moderators = true, $ret
737737
'ALBUM_IMG_STYLE' => $folder_image,
738738
'ALBUM_FOLDER_IMG' => $this->user->img($folder_image, $folder_alt),
739739
'ALBUM_FOLDER_IMG_ALT' => $this->language->lang($folder_alt) ? $this->language->lang($folder_alt) : '',
740-
//'ALBUM_IMAGE' => ($row['album_image']) ? $row['album_image'] : '',
740+
'ALBUM_IMAGE' => ($row['album_image']) ? $row['album_image'] : '',
741741
'LAST_IMAGE_TIME' => $lastimage_time,
742742
'LAST_USER_FULL' => ($s_username_hidden) ? $this->language->lang('CONTEST_USERNAME') : get_username_string('full', $row['album_last_user_id'], $row['album_last_username'], $row['album_last_user_colour']),
743743
'UC_THUMBNAIL' => $this->config['phpbb_gallery_mini_thumbnail_disp'] ? $lastimage_uc_thumbnail : '',

‎core/styles/prosilver/template/gallery/album_body.html‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ <h2>{L_ALBUM_NAME}{L_COLON}<a href="{U_VIEW_ALBUM}" style="display: inline;"> {A
4848
<div class="pagination">
4949
{TOTAL_IMAGES}
5050
<!-- IF .pagination -->
51-
&bull; <!-- INCLUDE pagination.html -->
51+
<!-- INCLUDE pagination.html -->
5252
<!-- ELSE -->
5353
&bull; {PAGE_NUMBER}
5454
<!-- ENDIF -->
@@ -100,15 +100,13 @@ <h2>{L_ALBUM_NAME}{L_COLON}<a href="{U_VIEW_ALBUM}" style="display: inline;"> {A
100100
<div class="pagination">
101101
{TOTAL_IMAGES}
102102
<!-- IF .pagination -->
103-
&bull; <!-- INCLUDE pagination.html -->
103+
<!-- INCLUDE pagination.html -->
104104
<!-- ELSE -->
105105
&bull; {PAGE_NUMBER}
106106
<!-- ENDIF -->
107107
</div>
108108
<!-- ENDIF -->
109109
</div>
110-
<br />
111-
<br />
112110
<!-- ENDIF -->
113111
<!-- ENDIF -->
114112

‎core/styles/prosilver/template/gallery/albumlist_polaroid.html‎

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -17,20 +17,19 @@
1717
<!-- IF albumrow.UC_THUMBNAIL -->
1818
<a href="{albumrow.U_VIEWALBUM}" class="polaroid_img_container"><img src="{albumrow.UC_THUMBNAIL}" alt="{albumrow.UC_IMAGE_NAME}" title="{L_VIEW_ALBUM}{albumrow.UC_IMAGE_NAME}" /></a>
1919
<!-- ENDIF -->
20-
2120
<hr />
2221
{L_IMAGES}{L_COLON} <strong>{albumrow.IMAGES} <!-- IF albumrow.UNAPPROVED_IMAGES --> + <span class="reported-images-number">{albumrow.UNAPPROVED_IMAGES}</span><!-- ENDIF --></strong><br />
2322

2423
<!-- IF albumrow.LAST_IMAGE_TIME -->
2524
<span>
26-
<div style="height: 33px; padding-top: 2px;">
25+
<div style="height: 23px; padding-top: 2px;">
2726
<!-- IF albumrow.UC_IMAGE_NAME -->{albumrow.UC_IMAGE_NAME}<br /><!-- ENDIF -->
2827
<p style="white-space: nowrap; overflow: hidden; text-overflow: ellipsis; margin-bottom: 2px;">{L_LAST_IMAGE_BY}{L_COLON} {albumrow.LAST_USER_FULL} {albumrow.UC_LASTIMAGE_ICON}</p>
29-
<p>{albumrow.LAST_IMAGE_TIME}</p>
28+
<p>&raquo; {albumrow.LAST_IMAGE_TIME}</p>
3029
</div>
3130
</span>
3231
<!-- ELSE -->
33-
<span><div style="height: 33px; padding-top: 2px;"></div></span>
32+
<span><div style="height: 23px; padding-top: 2px;"></div></span>
3433
<!-- ENDIF -->
3534

3635
<!-- IF EXTENDED_POLAROID and albumrow.MODERATORS -->
@@ -42,19 +41,21 @@
4241
<!-- ENDIF -->
4342

4443
<!-- IF .albumrow.subalbum and albumrow.S_LIST_SUBALBUMS -->
45-
<div class="dropdown-container">
44+
<div class="dropdown-container"><i class="icon fa-sitemap fa-fw icon-md" aria-hidden="true"></i>
4645
<a href="#" class="responsive-menu-link dropdown-trigger">{albumrow.L_SUBALBUM_STR}</a>
4746
<div class="dropdown" style="display: none;">
4847
<div class="pointer"><div class="pointer-inner"></div></div>
4948
<div class="dropdown-contents">
5049
<!-- BEGIN subalbum -->
51-
<a href="{albumrow.subalbum.U_SUBALBUM}" class="subforum<!-- IF albumrow.subalbum.S_UNREAD --> unread<!-- ELSE --> read<!-- ENDIF -->" title="<!-- IF albumrow.subalbum.UNREAD -->{L_UNREAD_IMAGES}<!-- ELSE -->{L_NO_UNREAD_IMAGES}<!-- ENDIF -->">{albumrow.subalbum.SUBALBUM_NAME}</a><!-- IF not albumrow.subalbum.S_LAST_ROW --><br /><!-- ENDIF -->
52-
<!-- END subalbum -->
50+
<li>
51+
<a href="{albumrow.subalbum.U_SUBALBUM}" class="subforum<!-- IF albumrow.subalbum.S_UNREAD --> unread<!-- ELSE --> read<!-- ENDIF -->" title="<!-- IF albumrow.subalbum.UNREAD -->{L_UNREAD_IMAGES}<!-- ELSE -->{L_NO_UNREAD_IMAGES}<!-- ENDIF -->"><i class="icon fa-image fa-fw icon-md" aria-hidden="true"></i> {albumrow.subalbum.SUBALBUM_NAME}</a><!-- IF not albumrow.subalbum.S_LAST_ROW --><!-- ENDIF -->
52+
</li>
53+
<!-- END subalbum -->
5354
</div>
5455
</div>
5556
</div>
5657
<!-- ELSE -->
57-
<br/>
58+
<br />
5859
<!-- ENDIF -->
5960
</div>
6061
<!-- ENDIF -->

‎core/ucp/main_module.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1053,8 +1053,8 @@ function manage_subscriptions()
10531053
'UPLOADER' => ($row['image_contest'] && !$phpbb_ext_gallery_core_auth->acl_check('m_status', $row['image_album_id'])) ? $this->language->lang('CONTEST_USERNAME') : get_username_string('full', $row['image_user_id'], $row['image_username'], $row['image_user_colour']),
10541054
'LAST_COMMENT_BY' => get_username_string('full', $row['comment_user_id'], $row['comment_username'], $row['comment_user_colour']),
10551055
'COMMENT' => $row['image_comments'],
1056-
//'LAST_COMMENT_TIME' => $user->format_date($row['comment_time']),
1057-
//'IMAGE_TIME' => $user->format_date($row['image_time']),
1056+
'LAST_COMMENT_TIME' => $user->format_date($row['comment_time']),
1057+
'IMAGE_TIME' => $user->format_date($row['image_time']),
10581058
'UC_IMAGE_NAME' => $phpbb_ext_gallery_core_image->generate_link('image_name', $phpbb_ext_gallery_config->get('link_image_name'), $row['image_id'], $row['image_name'], $row['album_id']),
10591059
'UC_FAKE_THUMBNAIL' => $phpbb_ext_gallery_core_image->generate_link('fake_thumbnail', $phpbb_ext_gallery_config->get('link_thumbnail'), $row['image_id'], $row['image_name'], $row['album_id']),
10601060
'ALBUM_NAME' => $row['album_name'],

0 commit comments

Comments
 (0)