1
0
mirror of https://github.com/phpbb/phpbb.git synced 2025-02-25 12:33:29 +01:00

82 Commits

Author SHA1 Message Date
Vjacheslav Trushkin
5d999e008c [ticket/11552] Breadcrumbs in footer, tabs bg color
Change breadcrumbs layout in footer to match breadcrumbs
in header. Change background color for tabs dropdown menu

PHPBB3-11552
2013-10-17 21:11:39 +03:00
Andreas Fischer
2050a39da7 [feature/plupload/integration] Integration of Plupload
This commit is a highly-refactored and up-to-date version of Fyorl's work
which was part of his Google Summer of Code 2012 project "Attachment
Improvements".

PHPBB3-10929
2013-10-11 17:40:16 +02:00
Andreas Fischer
94b49d8a92 [ticket/11703] Make jQuery CDN switch more generic.
Config variable: load_jquery_cdn -> allow_cdn
Template variable: S_JQUERY_FALLBACK -> S_ALLOW_CDN

PHPBB3-11703
2013-10-10 23:26:03 +02:00
Marc Alexander
1c1eecb376 [ticket/11809] Ensure code.js is first script included after jQuery
The file core.js sets up most of the AJAX and jQuery related framework for
phpBB. Due to this, it needs to be included before any other javascript file
in order to ensure that subsequent files can use the phpBB variables and
functions. Currently, it is however loaded with INCLUDEJS in overall_footer
which causes it to be loaded after every other javascript file except for the
style specific ajax.js. This causes every javascript file that is included
before core.js and is using the phpBB AJAX functions or variables to break.

PHPBB3-11809
2013-09-13 17:07:33 +02:00
Nathan Guse
346efbbb5b Merge pull request #1429 from cyberalien/ticket/11553
Move bulletin points for linklist lists to pseudo classes
2013-07-13 14:20:23 -07:00
Vjacheslav Trushkin
600d3bd1f6 [ticket/11553] Move bulletin points to pseudo class
Move bulletin points for .linklist lists to pseudo class
Group pseudo classes for .linklist.bulletin and .icon-notification

PHPBB3-11553
2013-07-11 11:11:38 -04:00
Nathan Guse
921d44aa4d [feature/twig] Put $SCRIPTS below overall_footer_after, use includejs for core
Moved below overall_footer_after so events can add JS files in that event.

PHPBB3-11598
2013-07-05 14:17:46 -05:00
Nathaniel Guse
59d13d0535 [feature/twig] INCLUDEJS behavior now supports local relative paths
This was done because T_TEMPLATE_PATH is not always correct for js files
(e.g. the inheriting style does not include these). Now we use the Twig
Loader to find the correct file to link to (most specific file first, then
parent styles). Also allows using @namespace convention

PHPBB3-11598
2013-07-02 11:07:12 -05:00
Nathaniel Guse
156d5c671f [feature/twig] INCLUDEJS now uses the definition class
This had to be done because, like DEFINE, setting variables to $context
only affected the local file and any children, not parent templates.

PHPBB3-11598
2013-07-02 10:13:16 -05:00
Nathaniel Guse
6c30441ad4 [feature/twig] Changing INCLUDEJS behavior slightly
Automatically parsing inline variables the same way it is done for
INCLUDE, INCLUDEPHP

PHPBB3-11598
2013-07-01 12:26:01 -05:00
Nathan Guse
1a0819bdc4 [feature/twig] Changing INCLUDEJS behavior
Was:
<!-- INCLUDEJS template/foo.js -->

Now:
<!-- INCLUDEJS T_TEMPLATE_PATH ~ '/foo.js' -->

Reasons for this:
1. INCLUDEJS is 3.1-dev only

2. INCLUDEJS has odd behavior to begin with (arbitrary setting root path
to styles/name/ directory)

3. INCLUDEJS could not include files from outside directories or anywhere
else

4. It was easier to change INCLUDEJS behavior to something more flexible
and useful than hack around it to make it work as it was with Twig.

PHPBB3-11598
2013-06-24 13:32:31 -05:00
Vjacheslav Trushkin
a9c9448ebb [ticket/11279] Clearer AJAX errors
Display clearer AJAX errors rather than generic error

PHPBB3-11279
2013-05-20 21:35:51 +03:00
Vjacheslav Trushkin
b8afef5df0 [ticket/11554] Move forum_fn.js to footer
Move forum_fn.js to footer, move find_username to forum_fn.js

PHPBB3-11554
2013-05-19 11:07:29 +03:00
Marc Alexander
d378f5ac32 [ticket/11433] Rename CSS class "jalert" to "phpbb_alert"
This missing change caused the loading info to appear during ajax
requests. With this patch it will be properly hidden as it should.

PHPBB3-11433
2013-03-12 15:15:21 +01:00
Joas Schilling
0bbde4c122 Merge branch 'develop' of https://github.com/phpbb/phpbb3 into ticket/11166
* 'develop' of https://github.com/phpbb/phpbb3: (799 commits)
  [ticket/11402] Fix undefined index in post/topic_in_queue
  [ticket/11400] If email is disabled, disable it for notifications
  [ticket/11398] Correctly call permission_set method in permission tool
  [ticket/11394] Relax Migration Tools
  [ticket/11386] Fix missing ;
  [ticket/10714] Get log from container in install, update and download/file
  [feature/avatars] Update module_auth of ucp module and fix small issues
  [ticket/11396] Rename insert_migration to set_migration_state
  [ticket/11395] Prevent acp_modules::get_modules_info from reincluding files
  [ticket/11393] Give more information on database updater
  [ticket/11386] Send list of migrations instead of using load_migrations
  [feature/avatars] Add migrations data file for avatars
  [feature/avatars] Reduce module auth of ucp avatar settings
  [ticket/10714] Use $phpbb_adm_relative_path instead of hardcoded adm/
  [ticket/10714] Logs are disabled for this page call only
  [ticket/6723] Show info that message has been deleted before delivery
  [ticket/11385] Fix issue with migration module tool not getting extension module info
  [ticket/11386] Fix failing tests from constructor changes
  [ticket/11386] Fix circular reference error & serialize error
  [ticket/11386] Remove tests that check if finder cache is working
  ...

Conflicts:
	phpBB/assets/javascript/core.js
2013-03-06 07:35:47 +01:00
Joas Schilling
0d7f61dc7a [ticket/11166] Use provided custom templates on AJAX confirm box
PHPBB3-11166
2012-12-18 13:50:56 +01:00
David King
9015a76cf6 [feature/events] Fix events in prosilver overall_footer.html
PHPBB3-9550
2012-12-17 11:37:46 -05:00
Michael Cullum
a6122228eb [feature/events] Adjust to use prepend, not before
PHPBB3-9550
2012-12-17 11:37:33 -05:00
Michael Cullum
0b35136894 [feature/events] Add overall_footer_copyright_after template event
PHPBB3-9550
2012-12-17 11:37:31 -05:00
Michael Cullum
336f0c5641 [feature/events] Rename event to show location around copyright
PHPBB3-9550
2012-12-17 11:37:30 -05:00
Michael Cullum
8dcc2cded6 [feature/events] Rename RUNHOOKS to EVENT
Apply change to existing ledges

PHPBB3-9550
2012-12-17 11:37:11 -05:00
Michael Cullum
244978cdb4 [feature/events] Adding overall_footer_end template ledge
Helpful for JS scripts that need to work with the DOM.

PHPBB3-9550
2012-12-17 11:37:02 -05:00
Michael Cullum
8534cbcc84 [feature/events] Adding overall_footer_index_link template ledge
Used by board3portal

PHPBB3-9550
2012-12-17 11:36:58 -05:00
Michael Cullum
fc2ebc34df [feature/events] Adds overall_footer_copyright template ledge
This allows people to add copyright information to the footer

PHPBB3-9550
2012-12-17 11:36:54 -05:00
Nathan Guse
9e5505933a [ticket/11021] Fix the language changes that were lost previously
Change U_HOME to U_SITE_HOME

PHPBB3-11021
2012-09-15 11:28:58 -05:00
Nathan Guse
7a47013994 [ticket/11021] Use L_SITE_HOME instead of L_HOME
Check site home url against !== '', not empty

PHPBB3-11021
2012-09-15 10:44:18 -05:00
Nathan Guse
a5dd64195a [ticket/11021] Add the option to specify a Site home URL and text
PHPBB3-11021
2012-07-22 22:26:38 -05:00
Joas Schilling
f1056a9b2f [ticket/10811] Make toogle_subscribe more generic so it can toogle all links
PHPBB3-10811
2012-07-05 01:03:19 +02:00
Joas Schilling
fc3a19567f [ticket/10811] Make it easier for MODs/Extensions to define the alt-text
PHPBB3-10811
2012-05-16 13:44:40 +02:00
Joas Schilling
53a47fdcc3 [ticket/10811] Make subscribe/unsubscribe repeatable with AJAX
PHPBB3-10811
2012-04-29 12:33:55 +02:00
Andreas Fischer
de7a166a59 Merge remote-tracking branch 'callumacrae/ticket/10783' into develop
* callumacrae/ticket/10783:
  [ticket/10783] Fixed an HTML error with assets_version.
2012-04-13 13:35:37 +02:00
Callum Macrae
875958573c [ticket/10783] Fixed an HTML error with assets_version.
PHPBB3-10783
2012-04-13 12:10:49 +01:00
Nils Adermann
790cc0c54f Merge remote-tracking branch 'github-callumacrae/ticket/10783' into develop
* github-callumacrae/ticket/10783:
  [ticket/10783] Added assets_version to ACP and simple_*.html.
  [ticket/10783] Added assets_version to subsilver2.
  [ticket/10783] Added ?assets_version to assets.
2012-04-13 03:32:01 +02:00
Callum Macrae
5665e82616 [ticket/10783] Added ?assets_version to assets.
PHPBB3-10783
2012-04-11 14:30:11 +01:00
Shibu Lijack
fd55c8664a Merge remote-tracking branch 'upstream/develop' into ticket/10734
Conflicts:
	phpBB/styles/prosilver/theme/tweaks.css
2012-04-10 21:46:14 +05:30
Oleg Pudeyev
7d6b289671 Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/10607] Added 'Powered by' translation string.

Conflicts:
	phpBB/adm/index.php
	phpBB/language/en/common.php
2012-04-04 15:33:51 -04:00
Fyorl
0ceb77fb99 [ticket/10607] Added 'Powered by' translation string.
Added POWERED_BY line to common.php and modified the templates
to use it.

PHPBB3-10607
2012-04-04 11:38:15 +08:00
Shibu Lijack
03f5fde747 [ticket/10734] Removed unwanted span classes
Removed the corner and clear span classes

PHPBB-10734
2012-04-02 00:42:11 +05:30
Vjacheslav Trushkin
2225efc560 [ticket/10665] INCLUDEJS template changes
Implementing INLCUDEJS template tag in styles

PHPBB3-10665
2012-04-01 10:58:59 +03:00
Shibu Lijack
609e8e3b11 [ticket/10734] Fixed template files
Removed unnecessary span from overall_header, overall_footer,
forumlist_body, viewforum_body.

PHPBB3-10734
2012-03-31 22:30:00 +05:30
Vjacheslav Trushkin
6145e0ba65 [ticket/10270] Changing close button for ajax popups
Changed close button for popups to match prosilver style and from img to css, moved color values to colours.css

PHPBB3-10270
2012-03-31 02:10:16 +02:00
Igor Wiedler
27199bb509 [feature/ajax] Generic error handling with a phpbb.alert box
PHPBB3-10270
2012-03-31 02:09:26 +02:00
Callum Macrae
2189efadc6 [ticket/10270] Moved the AJAX error langyage entries to the footer.
PHPBB3-10270
2012-03-31 02:09:22 +02:00
Callum Macrae
3166cbb33d [ticket/10270] Replaced find by tag names with class names in the js.
What it was before (selecting by tag name) could have caused some
problems for style authors.

PHPBB3-10270
2012-03-31 02:09:18 +02:00
Callum Macrae
ba817086f8 [ticket/10270] Renamed the CSS class "jalert" to "phpbb_alert".
PHPBB3-10270
2012-03-31 02:09:17 +02:00
Callum Macrae
db7c4f938e [ticket/10270] Added close buttons to phpbb.alert and phpbb.confirm.
PHPBB3-10270
2012-03-31 02:09:17 +02:00
Callum Macrae
0e55b2393d [ticket/10270] Removed all the inline language and HTML from the JS.
PHPBB3-10270
2012-03-31 02:09:17 +02:00
Callum Macrae
818d989168 [feature/ajax] Moved script.js into a few different files.
Seperated it into: assets/javascript/core.js,
styles/prosilver/template/ajax.js and adm/style/ajax.js.

PHPBB3-10270
2012-03-31 02:09:17 +02:00
Callum Macrae
431a78f346 [ticket/10270] Got rid of the temporary jQuery for the AJAX changes.
The jQuery library wasn't included before, so a temporary one was
included. Now that igorws jQuery patch has been merged, the temporary
library can be removed.

PHPBB3-10270
2012-03-31 02:09:16 +02:00
Callum Macrae
420de9c9a0 [ticket/10270] Moved some HTML from the JavaScript to overall_footer.
PHPBB3-10270
2012-03-31 02:09:14 +02:00