Skip to content
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.

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

#2972 (stats.php) forum statistics to twig #3011

Closed
wants to merge 14 commits into from
Closed

#2972 (stats.php) forum statistics to twig #3011

wants to merge 14 commits into from

Conversation

Matslom
Copy link
Contributor

@Matslom Matslom commented Jan 25, 2018

For #2972

  • stats
  • stats_thread
  • stats_topforum
+ stats -> stats/stats.twig
- stats_thread
- stats_topforum

euantorano and others added 14 commits December 11, 2017 15:58
* Adding a composer configuration file for the project, with no defined dependencies.

* Rquire autoload file

Signed-off-by: Euan Torano <euantorano@gmail.com>

* Removing global.php from files to autoload
* Adding Laravel container

Signed-off-by: Euan Torano <euantorano@gmail.com>

* Updating doc comment for app() function

Signed-off-by: Euan Torano <euantorano@gmail.com>
* Initial admin routing setup

* Adding a basic layout for the ACP
* Starting work on moving front end to Twig

This marks the start of integrating Twig into the front end. There are two global variables shared with all views - mybb and lang.

Signed-off-by: Euan Torano <euantorano@gmail.com>

* Starting the long process of template translation

Not much to show yet, but this is a first step towards seeing that key variables such as $mybb, $lang and $theme can be accessed.

Need to sort out loading of stylesheets still to make things look decent.

Signed-off-by: Euan Torano <euantorano@gmail.com>

* Changing how language is registered

There is a new LangExtension that provides a `trans` function along with the `lang` global.

Signed-off-by: Euan Torano <euantorano@gmail.com>

* Showing drafts by adding drafts to an array

Moved setting of theme global to theme extension.

Need to fix the use of |raw in some places - we should generate the HTML inside the views themselves instead…

Signed-off-by: Euan Torano <euantorano@gmail.com>

* Finished the majority of work on the drafts page

Signed-off-by: Euan Torano <euantorano@gmail.com>

* Add return type hints

Signed-off-by: Euan Torano <euantorano@gmail.com>

* Fixing trow usage currently following 1.8 standard

Signed-off-by: Euan Torano <euantorano@gmail.com>
…2975)

* Working on #2972 Template Conversion to Twig Format (warnings.php)
Part 1 - User warning log

* Coding standards

* Working on #2972 Template Conversion to Twig Format (warnings.php)
Part 2 - Warning details

* Working on #2972 Template Conversion to Twig Format (warnings.php)
Part 3 - Warning a user
…2983)

* Working on #2972 Template Conversion to Twig Format (sendthread.php)

* Removed double escaping
* Starting work on translatig subscribed threads

Signed-off-by: Euan Torano <euantorano@gmail.com>

* Finish subscriptions page in UCP

Signed-off-by: Euan Torano <euantorano@gmail.com>

* Use `&amp;` rather than `&` in URL.

Signed-off-by: Euan Torano <euantorano@gmail.com>

* Move HTML out of PHP into view

Also use `threadprefix` as `raw` as it can contain HTML.
* For #2972

* added whitespace

* remove htmlspecialchars_uni
…2984)

* Working on #2972 Template Conversion to Twig Format (calendar.php)
Part 1 - Adding an event

* Working on #2972 Template Conversion to Twig Format (calendar.php)
Part 2 - Editing an event

* Working on #2972 Template Conversion to Twig Format (calendar.php)
Part 3 - Moving event

* Working on #2972 Template Conversion to Twig Format (calendar.php)
Part 4 - Viewing an event

* Working on #2972 Template Conversion to Twig Format (calendar.php)
Part 5 - Day view

* Working on #2972 Template Conversion to Twig Format (calendar.php)
Part 6 - Week view

* Working on #2972 Template Conversion to Twig Format (calendar.php)
Part 7 - Calendar

* Moved gobutton to inline

* Code updates
-Added selected and checked HTML to templates
-Move day select options to array

* More code updates
- Moved month select options to array
- Split bottom calendar jump/month jump into seperate Twig file
- Converted user stars to Twig
…ing on PHP 7.2 (#2995)

* [FIX] string to array conversation causing Illegal string offset warning
on PHP 7.2

* Use 4 spaces instead of tab
Signed-off-by: Euan Torano <euantorano@gmail.com>
(cherry picked from commit afa523f)
@Matslom
Copy link
Contributor Author

Matslom commented Jan 25, 2018

Not sure about this lines. It's not very messy, but maybe splitting this lang into two parts would be better idea.
https://github.com/Matslom/mybb/blob/fabee05ad8ff33ac807066949b94b1f73b23d4e1/inc/views/base/stats/stats.twig#L41-L42

@andrewjs18 andrewjs18 added the b:1.9 Branch: 1.9.x label Jan 29, 2018
@euantorano
Copy link
Member

@Matslom It may make sense to split that language variable into two parts, yeah. It doesn't look too bad like this though, so I'd be happy to merge this if you're happy with it.

@Matslom
Copy link
Contributor Author

Matslom commented Feb 4, 2018

@euantorano So I will split it to two parts. Tomorrow most likely.

@euantorano
Copy link
Member

euantorano commented Feb 4, 2018 via email

@euantorano
Copy link
Member

Unfortunately this PR is now conflicted due to the rebase after releasing 1.8.15. Any chance you could take a look at it?

@Matslom
Copy link
Contributor Author

Matslom commented Apr 15, 2018

@euantorano I will try fix it in this week.

@effone effone added the s:conflict Status: Conflict. Solution incompatible with current code label May 12, 2018
@skmedix
Copy link

skmedix commented Nov 18, 2018

@euantorano You can close it now.

@euantorano euantorano closed this Nov 18, 2018
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
b:1.9 Branch: 1.9.x s:conflict Status: Conflict. Solution incompatible with current code
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

7 participants