aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/adm/style/acp_forums.html
diff options
context:
space:
mode:
authorMeik Sievertsen <acydburn@phpbb.com>2006-09-30 14:58:05 +0000
committerMeik Sievertsen <acydburn@phpbb.com>2006-09-30 14:58:05 +0000
commitb08c54f35eb85d0ccd01c65e1d9460603fc1c076 (patch)
tree252d8a70ca5e3b84eb590c404a2fe7df16653972 /phpBB/adm/style/acp_forums.html
parente4fc191e0dba2f18dd046451f1a95e4fb9e76a88 (diff)
downloadforums-b08c54f35eb85d0ccd01c65e1d9460603fc1c076.tar
forums-b08c54f35eb85d0ccd01c65e1d9460603fc1c076.tar.gz
forums-b08c54f35eb85d0ccd01c65e1d9460603fc1c076.tar.bz2
forums-b08c54f35eb85d0ccd01c65e1d9460603fc1c076.tar.xz
forums-b08c54f35eb85d0ccd01c65e1d9460603fc1c076.zip
- fixing a bug i am unsure about when it occurs (but it occurs). The symptoms are broken template cache files if after removing unnecessary php opening/closing tags result in statements being syntactially incorrect.
- added real syncing to forums acp (not only forum statistics rebuild) git-svn-id: file:///svn/phpbb/trunk@6419 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/adm/style/acp_forums.html')
-rw-r--r--phpBB/adm/style/acp_forums.html52
1 files changed, 45 insertions, 7 deletions
diff --git a/phpBB/adm/style/acp_forums.html b/phpBB/adm/style/acp_forums.html
index 9b203023d4..adcc5d18ef 100644
--- a/phpBB/adm/style/acp_forums.html
+++ b/phpBB/adm/style/acp_forums.html
@@ -283,8 +283,40 @@
</form>
+<!-- ELSEIF S_CONTINUE_SYNC -->
+
+ <script type="text/javascript">
+ <!--
+
+ var close_waitscreen = 0;
+ window.open('{UA_PROGRESS_BAR}', '_sync', 'height=240, resizable=yes, scrollbars=no, width=400');
+
+ //-->
+ </script>
+
+ <h1>{L_FORUM_ADMIN}</h1>
+
+ <p>{L_FORUM_ADMIN_EXPLAIN}</p>
+
+ <p>{L_PROGRESS_EXPLAIN}</p>
+
<!-- ELSE -->
+ <script type="text/javascript">
+ <!--
+
+ /**
+ * Popup search progress bar
+ */
+ function popup_progress_bar()
+ {
+ var close_waitscreen = 0;
+ window.open('{UA_PROGRESS_BAR}', '_sync', 'height=240, resizable=yes, scrollbars=no, width=400');
+ }
+
+ //-->
+ </script>
+
<h1>{L_FORUM_ADMIN}</h1>
<p>{L_FORUM_ADMIN_EXPLAIN}</p>
@@ -297,12 +329,18 @@
<!-- ENDIF -->
<!-- IF S_RESYNCED -->
+ <script language="javascript" type="text/javascript">
+ <!--
+ var close_waitscreen = 1;
+ //-->
+ </script>
+
<div class="successbox">
<h3>{L_NOTIFY}</h3>
<p>{L_FORUM_RESYNCED}</p>
</div>
<!-- ENDIF -->
-
+
<p><strong>{NAVIGATION}<!-- IF S_NO_FORUMS --> [<a href="{U_EDIT}">{L_EDIT}</a> | <a href="{U_DELETE}">{L_DELETE}</a><!-- IF not S_LINK --> | <a href="{U_SYNC}">{L_RESYNC}</a><!-- ENDIF --->]<!-- ENDIF --></strong></p>
<!-- IF .forums -->
@@ -320,20 +358,20 @@
<td style="vertical-align: top; width: 100px; text-align: right; white-space: nowrap;">
<!-- IF forums.S_FIRST_ROW && not forums.S_LAST_ROW -->
{ICON_MOVE_UP_DISABLED}
- <a href="{forums.U_MOVE_DOWN}">{ICON_MOVE_DOWN}</a>
+ <a href="{forums.U_MOVE_DOWN}">{ICON_MOVE_DOWN}</a>
<!-- ELSEIF not forums.S_FIRST_ROW && not forums.S_LAST_ROW-->
<a href="{forums.U_MOVE_UP}">{ICON_MOVE_UP}</a>
<a href="{forums.U_MOVE_DOWN}">{ICON_MOVE_DOWN}</a>
- <!-- ELSEIF forums.S_LAST_ROW && not forums.S_FIRST_ROW -->
+ <!-- ELSEIF forums.S_LAST_ROW && not forums.S_FIRST_ROW -->
<a href="{forums.U_MOVE_UP}">{ICON_MOVE_UP}</a>
{ICON_MOVE_DOWN_DISABLED}
<!-- ELSE -->
{ICON_MOVE_UP_DISABLED}
- {ICON_MOVE_DOWN_DISABLED}
- <!-- ENDIF -->
+ {ICON_MOVE_DOWN_DISABLED}
+ <!-- ENDIF -->
<a href="{forums.U_EDIT}">{ICON_EDIT}</a>
<!-- IF not forums.S_FORUM_LINK -->
- <a href="{forums.U_SYNC}">{ICON_SYNC}</a>
+ <a href="{forums.U_SYNC}" onclick="popup_progress_bar();">{ICON_SYNC}</a>
<!-- ELSE -->
{ICON_SYNC_DISABLED}
<!-- ENDIF -->
@@ -368,4 +406,4 @@
<!-- ENDIF -->
-<!-- INCLUDE overall_footer.html --> \ No newline at end of file
+<!-- INCLUDE overall_footer.html -->