Nathan Gray
|
2f6c66c600
|
WIP on converting Calendar to etemplate2
- Weekview shows widgets now
|
2015-05-06 19:03:45 +00:00 |
|
Hadi Nategh
|
0b6ebd4868
|
Fix freetime button overlaps duration time field
|
2015-04-07 13:15:33 +00:00 |
|
Hadi Nategh
|
b6a4afa80c
|
Fix style of details tab in edit dialog
|
2015-04-02 15:43:15 +00:00 |
|
Nathan Gray
|
3ceda8324d
|
Avoid validation error in alarm options
|
2015-04-01 17:26:04 +00:00 |
|
Ralf Becker
|
69dc97f8b2
|
* Calendar: added configuration "Use range-views to optimise calendar queries?", to go back to algorithm before 14.2.20150121
|
2015-03-31 14:28:35 +00:00 |
|
Nathan Gray
|
255494fc20
|
Fix resource participant search conflict checking
|
2015-03-12 16:24:55 +00:00 |
|
Hadi Nategh
|
ba0b87f6bc
|
Fix calendar participant field is not getting fullwidth
|
2015-03-10 14:49:33 +00:00 |
|
Hadi Nategh
|
216caf36d6
|
There should be no min-height set for tabs in popups if we want them resizable
|
2015-03-04 14:41:08 +00:00 |
|
Hadi Nategh
|
32596fb0e0
|
Implement widget historylog resize handler and fix historylog template in all apps
|
2015-02-25 16:30:49 +00:00 |
|
Hadi Nategh
|
48b449470d
|
Fix not getting an extra srollbar on calendar participant tab
|
2015-02-24 16:36:18 +00:00 |
|
Hadi Nategh
|
74c771a2c9
|
Fix calendar print template
|
2015-02-18 09:30:52 +00:00 |
|
Ralf Becker
|
d432642f1a
|
add encoding, eTempalte2 DTD and svn propset svn:keywords Id to all eTemplates
|
2015-02-17 09:55:05 +00:00 |
|
Hadi Nategh
|
1cac0fcff9
|
Remove tag css specification for et2_container in calendar
|
2015-02-06 13:49:09 +00:00 |
|
Hadi Nategh
|
959341969a
|
Set default tab_height and remove extra heights from single tabs
|
2015-02-03 10:52:48 +00:00 |
|
Nathan Gray
|
ec750ac330
|
Fix missing event creation click handler on non-et2 home views
|
2014-12-09 17:55:00 +00:00 |
|
Nathan Gray
|
05257dee87
|
Fix missing participants in print dialog - undo unwanted readonly
|
2014-12-08 20:59:01 +00:00 |
|
Nathan Gray
|
ec8ac93685
|
Fix missing participants in print dialog
|
2014-12-08 20:57:12 +00:00 |
|
Nathan Gray
|
4d861d43e6
|
Remove some options that don't exist
|
2014-12-08 20:46:38 +00:00 |
|
Hadi Nategh
|
78784a28e6
|
Change default behavior of multiline textbox resize
|
2014-12-05 13:39:21 +00:00 |
|
Hadi Nategh
|
eefb5963bf
|
Make edit popup dialogs compatible to resize window feature
|
2014-12-04 16:43:45 +00:00 |
|
Nathan Gray
|
939d99d9f6
|
Only hide the navigation buttons, leave the days
|
2014-12-03 00:33:35 +00:00 |
|
Nathan Gray
|
d62e9a1b0d
|
More Home progress:
- Hide navigation buttons in non-list calendar views to prevent reloads
- Fix state / session interference between home views & main calendar view
|
2014-12-03 00:20:57 +00:00 |
|
Hadi Nategh
|
93aa6fb83a
|
* Calendar: Add new feature to the calendar app, in order to be able to sort calendars in day and week views
|
2014-11-05 16:13:26 +00:00 |
|
Hadi Nategh
|
ca142a8734
|
Style print view of calendar entry
-Fix None blocking, whole day, and private options weird behavior in print view.
|
2014-11-04 15:34:51 +00:00 |
|
Hadi Nategh
|
60e203180c
|
Add event description to calendar event body if the event is longer than 3 hours
|
2014-10-27 14:37:38 +00:00 |
|
Hadi Nategh
|
3273c578f1
|
Fix extra scrollbar on calendar tab details
|
2014-10-22 08:28:16 +00:00 |
|
Ralf Becker
|
0c1f2c5d39
|
some styling for freetime search
|
2014-09-04 13:37:46 +00:00 |
|
Ralf Becker
|
38849094a9
|
* Calendar: if contact is added as participant and event has not yet a title add contact as title
|
2014-09-03 16:22:05 +00:00 |
|
Ralf Becker
|
94afafae11
|
* all apps: fixed column sizes and stretch (change when window size changes)
|
2014-08-22 11:08:21 +00:00 |
|
Hadi Nategh
|
cb4b0a9532
|
Give more space to calendar day-view todo list
|
2014-08-21 12:20:44 +00:00 |
|
Stefan Reinhardt
|
6a24ffb026
|
pixelegg / less
change @import....
|
2014-07-16 11:29:45 +00:00 |
|
Hadi Nategh
|
17b0c758f8
|
Fix calendar Category ACL does not apply changes
|
2014-07-15 15:18:06 +00:00 |
|
Stefan Reinhardt
|
87004edef8
|
changed image needs-action
|
2014-07-02 08:16:59 +00:00 |
|
Hadi Nategh
|
9dd173288b
|
Make sure nm action_popup in calendar list view is display:none
|
2014-07-01 12:03:39 +00:00 |
|
Hadi Nategh
|
3e2255c77a
|
Change delete and undelete recurrence events dialog message
|
2014-06-17 09:57:48 +00:00 |
|
Hadi Nategh
|
7f5af09f87
|
Retrive accidentally removed delete and undelete nm_popup templates from calendar listview temp by commit 45376. Additionally, fix error calling cal_delete for deleting recurrent events from listview
|
2014-06-17 09:44:15 +00:00 |
|
Hadi Nategh
|
7a9378d0d7
|
Fix calendar delete series event with exceptions
|
2014-06-16 16:49:45 +00:00 |
|
Hadi Nategh
|
06696b1f35
|
Fix Calendar alarm styling
|
2014-06-04 07:32:17 +00:00 |
|
Hadi Nategh
|
b063901fde
|
Set alarm's default value according to user preferences for both regular and wholeday events
|
2014-05-28 15:04:06 +00:00 |
|
Hadi Nategh
|
2e293c8b91
|
Fix too much height of alarm header row, and add "Alarms" title for alarms list
|
2014-05-27 15:51:02 +00:00 |
|
Hadi Nategh
|
706c69ed90
|
* Calendar/Alarm: Move calendar Alarm from Alarm tab to Details tab and make it more user friendly to add alarm
|
2014-05-27 15:02:56 +00:00 |
|
Hadi Nategh
|
291c4c04b4
|
No need to have explicitly fix et2_file width in calendaras the width is handled in etemplate2 class for all
|
2014-05-06 11:44:34 +00:00 |
|
Nathan Gray
|
3eaf87f78f
|
Fix some problems with calendar export causing a blank export popup
- missing template
- bad format on end date
|
2014-04-30 16:54:47 +00:00 |
|
Hadi Nategh
|
7f2cf7fed2
|
Add fullWidth class to participant select account in calendar edit popup
|
2014-04-24 12:46:37 +00:00 |
|
Nathan Gray
|
9f0009e743
|
Revert r46616, empty_label with tags is used as blur text
|
2014-04-22 15:48:07 +00:00 |
|
Hadi Nategh
|
f2d4f2cfe4
|
Remove empty_label from select account in Participants tab
|
2014-04-15 14:13:43 +00:00 |
|
Nathan Gray
|
0ff14b14fa
|
Change participant selection widget to use similar options to infolog delegation (account_type=both tags=true multiple=true)
|
2014-04-07 17:01:10 +00:00 |
|
Stefan Reinhardt
|
518be5def7
|
calendar: fixed group planer
|
2014-04-01 09:23:56 +00:00 |
|
Nathan Gray
|
06ea29a78c
|
Set sortmode=DESC for created column so newest show up on top for first click on the sortheader
|
2014-03-24 19:45:24 +00:00 |
|
Hadi Nategh
|
5f49f94ab4
|
Fix last_modified not aligned inline in calendar edit popup
|
2014-03-18 10:45:45 +00:00 |
|
Hadi Nategh
|
b4372023bb
|
Fix more wrong commenting in app.css
|
2014-03-12 13:42:34 +00:00 |
|
Hadi Nategh
|
b57aba0d23
|
Change content of label of "notification" checkbox in calendar edit popup toolbar, to get fit
|
2014-03-12 10:02:28 +00:00 |
|
Hadi Nategh
|
564ac4e821
|
Align category field in calendar edit popup
|
2014-03-11 14:15:07 +00:00 |
|
Hadi Nategh
|
0024a805c5
|
A few more changes on calendar edit popup layout
|
2014-03-11 14:08:12 +00:00 |
|
Hadi Nategh
|
e00ddbaeb3
|
Arrange calendar edit popup template
|
2014-03-11 10:45:02 +00:00 |
|
Stefan Reinhardt
|
ed134b2c6f
|
cal group planer: row_on + row_off fixed
|
2014-03-05 14:59:15 +00:00 |
|
Stefan Reinhardt
|
07257ef167
|
Ticket #6230 fixed
|
2014-03-05 11:56:21 +00:00 |
|
Stefan Reinhardt
|
0d817332ff
|
change css classes:
search field sidebar
mini calendar - color - sidebar
header: view week, day - arrow left and right , arranged
|
2014-03-05 10:53:28 +00:00 |
|
Hadi Nategh
|
b1efac06c0
|
Remove legacy actions from calendar listview
|
2014-02-26 15:56:55 +00:00 |
|
Hadi Nategh
|
384f1b4d45
|
Fix calendar navigation header img size
|
2014-02-25 15:04:32 +00:00 |
|
Hadi Nategh
|
531673f21e
|
Fix calendar navigation header img size
|
2014-02-25 14:59:01 +00:00 |
|
Hadi Nategh
|
96a313e48d
|
Add calendar navigation header classes
|
2014-02-25 14:50:35 +00:00 |
|
Hadi Nategh
|
ef7c211edc
|
Fix wrong image for calendar week,month view navigators, and style them
|
2014-02-25 14:20:27 +00:00 |
|
Nathan Gray
|
de828994f2
|
Set new expand_multiple_rows attribute
|
2014-02-24 18:20:28 +00:00 |
|
Ralf Becker
|
327e648c40
|
pixelegg changes from Wednesday
|
2014-02-19 19:12:30 +00:00 |
|
Ralf Becker
|
92c833afaa
|
quick fix now that grid overflow/height works
|
2014-02-19 10:46:34 +00:00 |
|
Ralf Becker
|
b5a1af92d9
|
Pixelegg changes from Thursday
|
2014-02-19 08:21:01 +00:00 |
|
Ralf Becker
|
7357e7190b
|
pixelegg changes from friday
|
2014-02-17 08:27:57 +00:00 |
|
Ralf Becker
|
f99ae4af0d
|
pixelegg changes from Tuesday
|
2014-02-12 08:10:11 +00:00 |
|
Hadi Nategh
|
bf376292f5
|
Style the d-n-d and resize time indicator
|
2014-02-10 08:53:42 +00:00 |
|
Ralf Becker
|
cb638a4848
|
simplified and fixed calendar edit template
|
2014-02-07 16:13:12 +00:00 |
|
Ralf Becker
|
0198a5196f
|
pixelegg changes from today
|
2014-02-06 17:36:03 +00:00 |
|
Ralf Becker
|
458648bf8b
|
pixelegg changes from Wednesday
|
2014-02-06 07:41:14 +00:00 |
|
Ralf Becker
|
8e35567e6a
|
some more layout fixes for calendar-edit
|
2014-02-05 11:14:44 +00:00 |
|
Ralf Becker
|
4c2e29f960
|
more styling of calendar edit
|
2014-02-05 10:04:13 +00:00 |
|
Ralf Becker
|
216be238c7
|
putting buttons in a hbox below grid, move "Do not notify" to other checkboxes in general tab and only show describtion textarea in that tab
|
2014-02-05 09:38:40 +00:00 |
|
Ralf Becker
|
470a204f85
|
renamed status icons to name them like corresponding status
|
2014-02-04 10:34:40 +00:00 |
|
Ralf Becker
|
332d4e5a42
|
removed gif images for which we have a png image available, as png is now supported by all browsers
|
2014-02-03 14:04:39 +00:00 |
|
Ralf Becker
|
84b6e72f4b
|
pixelegg changes up until now
|
2014-02-03 10:05:44 +00:00 |
|
Ralf Becker
|
90b00597b9
|
pixelegg changes from today/Thursday
|
2014-01-30 18:55:35 +00:00 |
|
Ralf Becker
|
5a39c2d260
|
calendar edit.xet: removed width="100%" and row on/off lines from general tab and set height on tabbox, as setting it on individuell tabs does not work anymore in eT2
|
2014-01-30 09:24:53 +00:00 |
|
Hadi Nategh
|
1e726cedac
|
Fix calendar d-n-d not showing forbiden sign when try to drop in not accepted area
|
2014-01-24 16:04:11 +00:00 |
|
Ralf Becker
|
e72b698faf
|
removed old action-popups to get ride of warning in js console
|
2014-01-24 15:48:44 +00:00 |
|
Hadi Nategh
|
fccd3f8d89
|
Fix not being able to move a series event. Additionally, brings a confirmation message for moving series event
|
2014-01-23 17:15:49 +00:00 |
|
Hadi Nategh
|
40b33e6a1d
|
Change old confirm dialogs to new et2_dialog in calendar edit popup
|
2014-01-23 10:27:18 +00:00 |
|
Ralf Becker
|
653f013975
|
pixelegg changes from wednesday
|
2014-01-23 08:44:49 +00:00 |
|
Ralf Becker
|
66cc87f7a8
|
pixelegg changes from Tuesday
|
2014-01-21 17:30:52 +00:00 |
|
Ralf Becker
|
e0bd105dd2
|
pixelegg changes from today
|
2014-01-18 17:52:26 +00:00 |
|
Ralf Becker
|
6688723a77
|
pixelegg changes from yesterday
|
2014-01-18 08:12:05 +00:00 |
|
Ralf Becker
|
96e0c77fce
|
pixelegg changes from thursday
|
2014-01-17 08:10:46 +00:00 |
|
Ralf Becker
|
7cc91b0046
|
new&modified images from pixelegg
|
2014-01-15 18:04:11 +00:00 |
|
Klaus Leithoff
|
60bb090278
|
pixelegg changes from wednesday, new/changed images and styles
|
2014-01-15 13:46:14 +00:00 |
|
Ralf Becker
|
629bd6f2ee
|
added pixelegg/less/svg.css stylesheet and id reflecting their name to all svn image
|
2014-01-14 16:14:51 +00:00 |
|
Klaus Leithoff
|
e5acab5fb9
|
pixelegg changes from tuesday
|
2014-01-14 16:04:20 +00:00 |
|
Ralf Becker
|
21bb9ef481
|
pixelegg changes from monday
|
2014-01-14 08:20:32 +00:00 |
|
Klaus Leithoff
|
2ebf237504
|
pixelegg changes from today
|
2014-01-10 11:07:08 +00:00 |
|
Ralf Becker
|
dbb4de0876
|
pixelegg changes from yesterday
|
2014-01-10 05:26:20 +00:00 |
|
Hadi Nategh
|
08f8b755b1
|
Fix styling for cal event tooltip in calendar
|
2014-01-07 10:34:11 +00:00 |
|
Klaus Leithoff
|
307cac1e03
|
pixelegg changes from 19.Dez
|
2013-12-20 09:35:46 +00:00 |
|
Nathan Gray
|
5708aaafed
|
Make sure angle brackets are angle brackets, fixes not well formed error in Firefox
|
2013-12-17 21:17:26 +00:00 |
|
Klaus Leithoff
|
b41be95681
|
latest pixelegg changes
|
2013-12-16 09:37:11 +00:00 |
|
Ralf Becker
|
1c7887ca6a
|
Pixelegg changes from Thursday
|
2013-12-12 20:27:35 +00:00 |
|
Ralf Becker
|
5c7a290ac9
|
pixelegg changes from last week
|
2013-11-25 03:19:58 +00:00 |
|
Ralf Becker
|
2b7d9af0a2
|
reverting to previous app.css file and remove app.less files, as they are not used by pixelegg template and create some glitches, might re-introduce .less for regular templates later
|
2013-11-18 19:57:38 +00:00 |
|
Ralf Becker
|
f8752688e0
|
pixelegg changes from today
|
2013-11-15 17:09:58 +00:00 |
|
Ralf Becker
|
727cdc83b3
|
newewst pixelegg changed from today
|
2013-11-14 19:29:55 +00:00 |
|
Ralf Becker
|
583538e824
|
using now CSS preprocessor less (http://lesscss.org) to create some of our css files, used a lot in new Pixelegg template
|
2013-11-11 19:10:28 +00:00 |
|
Ralf Becker
|
77a30817d6
|
images for new Pixelegg template
|
2013-11-11 18:56:02 +00:00 |
|
Hadi Nategh
|
3ccfe3fb93
|
Add app prefix name to calendar css classes
|
2013-11-11 14:02:08 +00:00 |
|
Hadi Nategh
|
511dbe1bea
|
Fix wrong tabs id in calendar app, edit popup window
|
2013-11-08 11:21:12 +00:00 |
|
Hadi Nategh
|
aa42d85575
|
Fix not working non_blocking checkbox in calendar->edit->popup window
|
2013-11-08 09:35:49 +00:00 |
|
Hadi Nategh
|
392548fdc3
|
Add missing templates of list.dates.xet and edit.alarms.xet in calendar app
|
2013-11-02 16:44:13 +00:00 |
|
Hadi Nategh
|
7783ec44e0
|
Calendar app runs by et2
|
2013-10-31 14:51:19 +00:00 |
|
Ralf Becker
|
ed9513e846
|
fixed "not working" save in Calendar >> Site config, gave a wrong, but not displayed, validation error
|
2013-06-05 07:22:27 +00:00 |
|
Ralf Becker
|
86d54d092c
|
* Calendar: configuration to automatic create links for participants from addressbook
|
2013-06-04 18:00:39 +00:00 |
|
Ralf Becker
|
50ed435eb7
|
* Calendar/InfoLog/Timesheet/Tracker/ProjectManager: edit focuses now automatic on title input
|
2013-05-23 09:01:33 +00:00 |
|
Ralf Becker
|
e47fca7d10
|
missing templates and a fix for new reply handling
|
2013-02-01 16:54:51 +00:00 |
|
Nathan Gray
|
66b95f54b6
|
When undeleting an event through the list context menu, if it is part of a series ask if you want to undelete the single event or the whole series
|
2013-01-14 17:21:28 +00:00 |
|
Nathan Gray
|
7ef3861b50
|
Hide delete popup
|
2013-01-09 21:38:54 +00:00 |
|
Nathan Gray
|
e016bcec71
|
When deleting an event through the list context menu, if it is part of a series ask if you want to delete the single event or the whole series
|
2013-01-09 21:38:18 +00:00 |
|
Nathan Gray
|
b83a19284a
|
UI changes for chosen selectboxes
|
2012-11-14 20:33:33 +00:00 |
|
Nathan Gray
|
74c683f6b2
|
Fix recurrence calendar popup for new entries too
|
2012-10-17 16:34:56 +00:00 |
|
Nathan Gray
|
7c9f8e18a5
|
Pre-set recurrence end date in popup to current start date
|
2012-10-16 22:01:48 +00:00 |
|
Nathan Gray
|
5a9e661dce
|
Pre-set recurrence end date in popup to start date
|
2012-10-16 21:55:53 +00:00 |
|
Klaus Leithoff
|
2eec3dd075
|
calendar/email: distinguish between meeting request and meeting reply, while displaying ics
|
2012-06-06 07:39:57 +00:00 |
|
Ralf Becker
|
5d7c91a66e
|
translating status-label now when the get used, to allow calendar_boupdate::_get_event_details() use language of to notify user
|
2012-05-15 13:23:11 +00:00 |
|
Ralf Becker
|
c4b76cf4e3
|
* Calendar: fixed not savable config "Prevent deleting of entries" as "Yes, users can purge their deleted items"
renamed from "user_purge" to "userpurge" (without underscore) as config can not handle situation when name and value contains underscores
|
2012-05-15 10:35:40 +00:00 |
|
Klaus Leithoff
|
d52c72207c
|
* calendar/importexport/addressbook: calendar introduce new config option to set app specific export_limit; calendar csv export: use enumerate for exporting events as csv; bo_merge: introduce new helper functions to get and check export-limit; addressbook: use new helper functions
|
2011-09-13 09:05:33 +00:00 |
|
Ralf Becker
|
f65fd9129f
|
* Calendar: added purge interval of half a year
|
2011-06-14 18:16:08 +00:00 |
|
Ralf Becker
|
cfc3039bc0
|
calling the global action-object-manager
|
2011-06-02 17:01:56 +00:00 |
|
Ralf Becker
|
af820949b4
|
transfering meeting requests via session, as get parameters are limited in size and also pass on charset, to handle non utf-8 meeting requests correct
|
2011-05-31 10:12:39 +00:00 |
|
Ralf Becker
|
59a91269e9
|
upper check-all button also needs to call egw_objectManager.toggleAllSelected()
|
2011-05-06 13:25:43 +00:00 |
|
Nathan Gray
|
45855d6b6e
|
Use action system to select all
|
2011-05-04 17:49:48 +00:00 |
|
Ralf Becker
|
653d4991d7
|
context menu for calendar list
|
2011-04-27 16:53:06 +00:00 |
|
Ralf Becker
|
1d9f9e4ee3
|
removed not used code and only query user what to do with exceptions, if we have some
|
2011-04-08 14:21:23 +00:00 |
|
Nathan Gray
|
de241b18f8
|
Add config setting to enable 'Do not notify' checkbox
|
2011-03-21 16:57:11 +00:00 |
|
Andreas Stöckel
|
70030216f3
|
Added possibility to view birthdays and/or holidays as non-blocking event in calender with special icon prepending it
|
2010-12-22 15:17:56 +00:00 |
|
Klaus Leithoff
|
0cd5658ca1
|
* calendar: make configurable the number of users, until day- or weekview are consolidated; 5 is set as default
|
2010-12-10 11:03:35 +00:00 |
|
Nathan Gray
|
7358243aa1
|
*Users can now see and restore their 'deleted' but held events, if deletion prevention is turned on. There is now a config setting to allow users to purge their own 'deleted' events.
|
2010-11-22 16:19:28 +00:00 |
|
Ralf Becker
|
8dcbba0edc
|
MyStylite bug #972: automatic scrollbar in calendar listview for long describtion is not right aligned
|
2010-11-09 10:46:03 +00:00 |
|
Ralf Becker
|
7f3e6d8897
|
fixed 40px higher tab for history in calendar.edit
|
2010-11-02 14:23:04 +00:00 |
|
Ralf Becker
|
dc288bc4e5
|
moved config of calendar horizont from Admin >> Site configuration to Calendar >> Site configuration
|
2010-08-24 07:33:26 +00:00 |
|
Ralf Becker
|
b51c248768
|
* fixed printing in calendar (only first page of list was printed and some UI not disabled)
--> fix for egw.stylite.de bug #8142: calendar list view printed on three pages
|
2010-08-23 15:57:09 +00:00 |
|
Ralf Becker
|
1d98728552
|
fixed not disabled custom field tab, if no cfs exist
(problem was added history tab, which changed name of tabs widget, now using "tabs=general|...")
|
2010-08-16 07:13:47 +00:00 |
|
Hans-Jürgen Tappe
|
a66ae024a9
|
Tracker #2453. Introduce a year view, which uses a fixed month / day grid and
displays the events inline (like in day / week view).
|
2010-07-31 07:51:52 +00:00 |
|
Nathan Gray
|
f8431b00a7
|
- Fix purging of old events so it doesn't delete everything
- Trick config into calling the hook when purging is turned off so cron job is cancelled
|
2010-07-01 15:27:37 +00:00 |
|
Ralf Becker
|
f616c628b5
|
fixed not working display and deleting of recurence exceptions (name of grid in template got somehow lost)
|
2010-06-28 13:46:39 +00:00 |
|
Ralf Becker
|
0e234a718f
|
setting widht: 99%; to cope with borders
|
2010-06-09 12:34:10 +00:00 |
|
Ralf Becker
|
a91b9f2ebf
|
added Jörgs delete_series popup to calendar.edit, thought calendar does NOT yet react on the user choice of deleting the exececptions or not (also moved styles again to app.css file)
|
2010-05-20 09:19:15 +00:00 |
|
Klaus Leithoff
|
8fbb39aded
|
use more stylish dialog for prompt action on edit-series; translations provided by mkk
|
2010-04-28 13:42:10 +00:00 |
|