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.

Sign up for GitHub

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

Jump to bottom

Fix tt2 indentation #582

Merged
merged 4 commits into from
Apr 14, 2019
Merged

Fix tt2 indentation #582

merged 4 commits into from
Apr 14, 2019

Conversation

ldidry
Copy link
Contributor

@ldidry ldidry commented Apr 1, 2019 •
edited by ikedas
Loading

Files to review (I already reviewed them, but more reviewers is better) (remember to hide whitespace changes before reviewing, git diff -w on the CLI):

  • default/web_tt2/active_lists.tt2
  • default/web_tt2/admin.tt2
  • default/web_tt2/ajax.tt2
  • default/web_tt2/arc.tt2
  • default/web_tt2/arc_manage.tt2
  • default/web_tt2/arcsearch.tt2
  • default/web_tt2/arcsearch_form.tt2
  • default/web_tt2/aside_menu.tt2
  • default/web_tt2/blacklist.tt2
  • default/web_tt2/button_footer.tt2
  • default/web_tt2/button_header.tt2
  • default/web_tt2/choosepasswd.tt2
  • default/web_tt2/compose_mail.tt2
  • default/web_tt2/config_common.tt2
  • default/web_tt2/confirm_action.tt2
  • default/web_tt2/copy_template.tt2
  • default/web_tt2/crash.tt2
  • default/web_tt2/create_automatic_list_request.tt2
  • default/web_tt2/create_list_request.tt2
  • default/web_tt2/css.tt2
  • default/web_tt2/css_ie.tt2
  • default/web_tt2/d_control.tt2
  • default/web_tt2/d_editfile.tt2
  • default/web_tt2/d_install_shared.tt2
  • default/web_tt2/d_properties.tt2
  • default/web_tt2/d_read.tt2
  • default/web_tt2/d_upload.tt2
  • default/web_tt2/docindex.tt2
  • default/web_tt2/dump_scenario.tt2
  • default/web_tt2/dumpvars.tt2
  • default/web_tt2/edit.tt2
  • default/web_tt2/edit_attributes.tt2
  • default/web_tt2/edit_config.tt2
  • default/web_tt2/edit_list_request.tt2
  • default/web_tt2/edit_template.tt2
  • default/web_tt2/editfile.tt2
  • default/web_tt2/editsubscriber.tt2
  • default/web_tt2/error.tt2
  • default/web_tt2/family_signoff_request.tt2
  • default/web_tt2/footer.tt2
  • default/web_tt2/get_biggest_lists.tt2
  • default/web_tt2/get_closed_lists.tt2
  • default/web_tt2/get_inactive_lists.tt2
  • default/web_tt2/get_latest_lists.tt2
  • default/web_tt2/get_pending_lists.tt2
  • default/web_tt2/head_javascript.tt2
  • default/web_tt2/head_ui.tt2
  • default/web_tt2/header.tt2
  • default/web_tt2/help.tt2
  • default/web_tt2/help_admin-archives.tt2
  • default/web_tt2/help_admin-bounces.tt2
  • default/web_tt2/help_admin-closelist.tt2
  • default/web_tt2/help_admin-createlist.tt2
  • default/web_tt2/help_admin-editfile.tt2
  • default/web_tt2/help_admin-editlist-archives.tt2
  • default/web_tt2/help_admin-editlist-bounces.tt2
  • default/web_tt2/help_admin-editlist-command.tt2
  • default/web_tt2/help_admin-editlist-description.tt2
  • default/web_tt2/help_admin-editlist-other.tt2
  • default/web_tt2/help_admin-editlist-sending.tt2
  • default/web_tt2/help_admin-editlist.tt2
  • default/web_tt2/help_admin-members.tt2
  • default/web_tt2/help_admin-moderate.tt2
  • default/web_tt2/help_admin-renamelist.tt2
  • default/web_tt2/help_admin-rules.tt2
  • default/web_tt2/help_admin-shared.tt2
  • default/web_tt2/help_admin-users.tt2
  • default/web_tt2/help_admin.tt2
  • default/web_tt2/help_arc-post.tt2
  • default/web_tt2/help_arc-search-advanced.tt2
  • default/web_tt2/help_arc-search-result.tt2
  • default/web_tt2/help_arc-search-simple.tt2
  • default/web_tt2/help_arc-search.tt2
  • default/web_tt2/help_arc.tt2
  • default/web_tt2/help_commands.tt2
  • default/web_tt2/help_faq-admin.tt2
  • default/web_tt2/help_faq-user-contact.tt2
  • default/web_tt2/help_faq-user.tt2
  • default/web_tt2/help_faq.tt2
  • default/web_tt2/help_index.tt2
  • default/web_tt2/help_introduction-features.tt2
  • default/web_tt2/help_introduction-policy.tt2
  • default/web_tt2/help_introduction-roles.tt2
  • default/web_tt2/help_introduction.tt2
  • default/web_tt2/help_shared-edit.tt2
  • default/web_tt2/help_shared-hint.tt2
  • default/web_tt2/help_shared-read.tt2
  • default/web_tt2/help_shared-upload.tt2
  • default/web_tt2/help_shared.tt2
  • default/web_tt2/help_user-authweb.tt2
  • default/web_tt2/help_user-listmenu.tt2
  • default/web_tt2/help_user-pref.tt2
  • default/web_tt2/help_user-review.tt2
  • default/web_tt2/help_user-rules.tt2
  • default/web_tt2/help_user-searchlist.tt2
  • default/web_tt2/help_user-sendmsg.tt2
  • default/web_tt2/help_user-signoff.tt2
  • default/web_tt2/help_user-suboptions.tt2
  • default/web_tt2/help_user-subscribe.tt2
  • default/web_tt2/help_user-suspend.tt2
  • default/web_tt2/help_user.tt2
  • default/web_tt2/home.tt2
  • default/web_tt2/import.tt2
  • default/web_tt2/including_lists.tt2
  • default/web_tt2/info.tt2
  • default/web_tt2/latest_arc.tt2
  • default/web_tt2/latest_d_read.tt2
  • default/web_tt2/latest_lists.tt2
  • default/web_tt2/list_button_footer.tt2
  • default/web_tt2/list_button_header.tt2
  • default/web_tt2/list_menu.tt2
  • default/web_tt2/list_panel.tt2
  • default/web_tt2/lists.tt2
  • default/web_tt2/lists_categories.tt2
  • default/web_tt2/login.tt2
  • default/web_tt2/login_menu.tt2
  • default/web_tt2/loginbanner.tt2
  • default/web_tt2/ls_templates.tt2
  • default/web_tt2/main.tt2
  • default/web_tt2/manage_template.tt2
  • default/web_tt2/modindex.tt2
  • default/web_tt2/my.tt2
  • default/web_tt2/nav.tt2
  • default/web_tt2/news.tt2
  • default/web_tt2/review.tt2
  • default/web_tt2/reviewbouncing.tt2
  • default/web_tt2/rss.tt2
  • default/web_tt2/rss_request.tt2
  • default/web_tt2/scenario_test.tt2
  • default/web_tt2/search_list_request.tt2
  • default/web_tt2/search_user.tt2
  • default/web_tt2/serveradmin.tt2
  • default/web_tt2/set_pending_list_request.tt2
  • default/web_tt2/setlang.tt2
  • default/web_tt2/show_cert.tt2
  • default/web_tt2/show_exclude.tt2
  • default/web_tt2/show_sessions.tt2
  • default/web_tt2/sigindex.tt2
  • default/web_tt2/signoff.tt2
  • default/web_tt2/skinsedit.tt2
  • default/web_tt2/sso_login.tt2
  • default/web_tt2/stats.tt2
  • default/web_tt2/subindex.tt2
  • default/web_tt2/suboptions.tt2
  • default/web_tt2/subscribe.tt2
  • default/web_tt2/subscriber_table.tt2
  • default/web_tt2/suspend_request.tt2
  • default/web_tt2/sympa_menu.tt2
  • default/web_tt2/ticket.tt2
  • default/web_tt2/title.tt2
  • default/web_tt2/tracking.tt2
  • default/web_tt2/tt2_error.tt2
  • default/web_tt2/user_menu.tt2
  • default/web_tt2/view_template.tt2
  • default/web_tt2/viewbounce.tt2
  • default/web_tt2/viewlogs.tt2
  • default/web_tt2/viewmod.tt2

[EDIT] (@ikedas) Missing default/web_tt2/reviewbouncing.tt2.

@ldidry
Fix tt2 indentation
cf79580 
- 4 spaces indentation
- Indent on HTML tags AND on TT2 stuff ([% IF … %])
- Avoid HTML or TT2 oneliners like:
```
  [% IF top_menu %]…[% END %]
  <div class="displayNone"><a href="#top">Top of Page</a></div>
```
- When a tag has too many attributes to be on one line, indent the
  attributes at the same level than the first one:
```
<label class="foo"
       id="bar">
    Baz
</label>
```
@ldidry
Add/correct name of file at beginning and end of web_tt2 files
3aea9d0
@ldidry ldidry requested review from ikedas, dverdin and racke April 1, 2019 08:56
@ikedas ikedas added this to the 6.2.44 milestone Apr 2, 2019
@dverdin
Copy link
Contributor

dverdin commented Apr 2, 2019

You're a brave man, Luc.

@ldidry
Copy link
Contributor Author

ldidry commented Apr 2, 2019

It was like a never ending opening cabinet with a lot of files

And at the end, I felt like the mad hatter in Alice in Wonderland

But it will sure make future changes easier, and customisation for admins too 😉

ikedas
ikedas reviewed Apr 9, 2019
View reviewed changes
default/web_tt2/css.tt2 Outdated Show resolved Hide resolved
ikedas
ikedas reviewed Apr 10, 2019
View reviewed changes
default/web_tt2/news.tt2 Outdated Show resolved Hide resolved
@ikedas
Copy link
Member

ikedas commented Apr 10, 2019

That's all. I'm exhausted...
_e_june_b19_s512_june_b19_0

@ldidry
Copy link
Contributor Author

ldidry commented Apr 10, 2019

Thank you for your review! I know that's a boring and exhausting job (especially for that huge PR).

@racke
Copy link
Contributor

racke commented Apr 10, 2019

Thanks a lot to both of you for this immense clean up 👍

@ikedas ikedas mentioned this pull request Apr 10, 2019
Merged
@ikedas ikedas merged commit e68a8c8 into sympa-community:sympa-6.2 Apr 14, 2019
@ldidry ldidry deleted the fix-tt2-indentation branch June 25, 2019 13:10
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@ikedas ikedas ikedas left review comments

@dverdin dverdin Awaiting requested review from dverdin

@racke racke Awaiting requested review from racke

Assignees

@ldidry ldidry

Labels
enhancement
Projects
None yet
Milestone
6.2.44
Development

Successfully merging this pull request may close these issues.
4 participants
@ldidry @dverdin @ikedas @racke