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

Jump to bottom

Improve "Delete event" modal #14

Closed
oanalavinia opened this issue Oct 15, 2018 · 0 comments
Closed

Improve "Delete event" modal #14

oanalavinia opened this issue Oct 15, 2018 · 0 comments
Assignees
@oanalavinia
Labels
Priority: Minor Type: Improvement
Milestone
2.8

Comments

@oanalavinia
Copy link

Preconditions
Have Calendar Application (Pro) installed

Steps to reproduce

  1. Click on Calendar from Application Panel
  2. Add an event and click on it
  3. Click on "Delete" button

The modal that it is shown is using Confirmation Modal
oldcalendarmodal

I propose to use a bootstrap modal
calendarmodal
@oanalavinia oanalavinia self-assigned this Oct 23, 2018
@oanalavinia oanalavinia added this to the 2.8 milestone Oct 23, 2018
oanalavinia added a commit to oanalavinia/application-mocca-calendar that referenced this issue Oct 29, 2018
@oanalavinia
Improve "Delete event" modal xwikisas#14
dc00b26 
* applied xar:format
oanalavinia added a commit to oanalavinia/application-mocca-calendar that referenced this issue Oct 30, 2018
@oanalavinia
Improve "Delete event" modal xwikisas#14
70e727b 
* applied xar:format
oanalavinia added a commit to oanalavinia/application-mocca-calendar that referenced this issue Oct 30, 2018
@oanalavinia
Improve "Delete event" modal xwikisas#14
7a84e2c
oanalavinia added a commit to oanalavinia/application-mocca-calendar that referenced this issue Oct 30, 2018
@oanalavinia
Improve "Delete event" modal xwikisas#14
bec328c 
* refactored some lines longer that 120 characters
oanalavinia added a commit to oanalavinia/application-mocca-calendar that referenced this issue Oct 30, 2018
@oanalavinia
Improve "Delete event" modal xwikisas#14
61b6da6 
* refactored some lines longer that 120 characters
oanalavinia added a commit to oanalavinia/application-mocca-calendar that referenced this issue Oct 31, 2018
@oanalavinia
Improve "Delete event" modal xwikisas#14
2053136 
* changed some code where jQuery was mixed with prototype
oanalavinia added a commit to oanalavinia/application-mocca-calendar that referenced this issue Nov 5, 2018
@oanalavinia
Improve "Delete event" modal xwikisas#14
0daf160 
* small changes
mflorea added a commit that referenced this issue Nov 5, 2018
@mflorea
Merge pull request #17 from oanalavinia/issue#14
48886d5 
Improve "Delete event" modal #14
ClemensRobbenhaar pushed a commit that referenced this issue Sep 24, 2021
@atallahade
Merge pull request #14 from xwikiorgci/weblate-xwiki-contrib-mocca-ca…
ba3842b 
…lendar-application

Update from Weblate.
ClemensRobbenhaar added a commit that referenced this issue Sep 24, 2021
@ClemensRobbenhaar
Merge remote-tracking branch 'upstream/master' into ckr-merge-upstream
47d363d 
Actually merge from the xwiki-contrib version.

The main new feature (recurrent events) are still disabled
after the merge as some UI elements where not really stable, namely
the date pickers. See MoccaCalendarEventSheet for the simple
"#if(false)" clauses disabling it.

Conflicts have been resolved as:

MoccaCalendarTranslations.*
   - added translations for recurrent events
   - added missing MoccaCalendarMacroTranslations from e.x.o version
     or add placeholders for them where missing

Code/WebHome
   - the automatic merge confused the page with the (also moved)
     MoccaCalendarEventLiveTableResults

Code/Macro
  - the improved "Delete event" modal (#14)
    needed to be merged with the "delete all instances" implementation
    it now has an extra buttom "delete all" only shown for recurrent events
  - upstream added newPageNameUrl, dateCheckUrl, deleteEventInstanceUrl to calendar.Helper
    for the new separate services split from the JSONService; now list each
    of them on a separate line for better reading

JSONService -> Code/JSONService, etc.
  - upstream service got distributed to several services pages in Code.
  - use of naming service (in #42) is now in Code.NewEventNameService
  - scrapped use of Calendar.Translations which are WIKI level (#26)
    now in Code.JSONService, too

Event/WebHome
  - probably because of the page move setting the text color
    (#19 / #22: set default to black) needed to be restored

MoccaCalendarSheet
  - the color picker fields had been reformatted upstream
    kept version from this repository

MoccaCalendarEventSheet
  - conflict between extracting a "getDateFormat" macro out of the "displayDate" macro
    and upstream change in this macro
  - conflict between new input fields for recurrent events upstream
    and a modification for the calender selection field
  - the "hidden" filter added for #49 has been migrated
    to the corresponding API code

and also the unavoidable version number clashes in the pom.xml
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Assignees

@oanalavinia oanalavinia

Labels
Priority: Minor Type: Improvement
Projects
None yet
Milestone
2.8
Development

No branches or pull requests
1 participant
@oanalavinia