Skip to content
This repository has been archived by the owner on Oct 31, 2018. It is now read-only.

12 Segment Color Wheel for Calendar Color Picker #979

Open
wants to merge 8 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,9 @@ Maintainers:
- [Thomas Tanghus](https://github.com/tanghus)
- [Bart Visscher](https://github.com/bartv2)

Developer setup info:
---------------------
__Important note__: ownCloud 7 or ownCloud 8 will be last version to ship the master branch's codebase. It will be replaced by the rework branch. If you want to implement new features, please strongly consider implementing them based on the rework branch's codebase.
Super urgent developer info:
============================
ownCloud 7 or ownCloud 8 will be last version to ship the master branch's codebase. It will be replaced by the rework branch. If you want to implement new features, please strongly consider implementing them based on the rework branch's codebase.

### Master branch:
Just clone this repo into your apps directory.
Expand Down
2 changes: 1 addition & 1 deletion appinfo/version
Original file line number Diff line number Diff line change
@@ -1 +1 @@
0.8.0
0.8.90
19 changes: 16 additions & 3 deletions css/style.css
Original file line number Diff line number Diff line change
Expand Up @@ -73,9 +73,22 @@ color:#A9A9A9;
select#category{width:140px;}
button.category{margin:0 3px;}

.calendar-colorpicker { display: inline-block; }
.calendar-colorpicker-color{display:inline-block;width:20px;height:20px;margin-right:2px;cursor:pointer;border:2px solid transparent;}
.calendar-colorpicker-color.active{border:2px solid black;}
.calendar-colorpicker {
display:inline-block;
line-height:0;
}
.calendar-colorpicker-color {
display:inline-block;
width:13px;
height:13px;
margin-right:1px;
margin-bottom:1px;
cursor:pointer;
border:2px solid transparent;
}
.calendar-colorpicker-color.active {
border:2px solid black;
}

#event {
height: initial !important;
Expand Down
12 changes: 12 additions & 0 deletions l10n/ast.js
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,8 @@ OC.L10N.register(
"The file contained either no events or all events are already saved in your calendar." : "El ficheru nun contién eventos o yá esisten nel to calendariu.",
"events have been saved in the new calendar" : "los eventos guardáronse nel nuevu calendariu",
"Import failed" : "Falló la importación",
"_%n event has been saved in the new calendar %s._::_%n events have been saved in the new calendar %s._" : ["Los eventos %n guardáronse nel nuevu calendariu %s.","Los eventos %n guardáronse nel nuevu calendariu %s."],
"_%n event has been saved in your calendar._::_%n events have been saved in your calendar._" : ["Los eventos %n guardáronse nel to calendariu","Los eventos %n guardáronse nel to calendariu"],
"New Timezone:" : "Nueva estaya horaria:",
"Timezone changed" : "Estaya horaria cambiada",
"Invalid request" : "Solicitú non válida",
Expand Down Expand Up @@ -85,23 +87,32 @@ OC.L10N.register(
"Error while changing permissions" : "Fallu mientres camudaben los permisos",
"Shared with you and the group {group} by {owner}" : "Compartíu contigo y col grupu {group} por {owner}",
"Shared with you by {owner}" : "Compartíu contigo por {owner}",
"Share with users or groups …" : "Compartir con usuarios o grupos",
"Share with users, groups or remote users …" : "Compartir con usuarios, grupos o usuarios remotos",
"Share" : "Compartir",
"Share with people on other ownClouds using the syntax [email protected]/owncloud" : "Compartir con xente d'otros ownClouds usando la sintaxis [email protected]/owncloud",
"Share link" : "Compartir enllaz",
"The public link will expire no later than {days} days after it is created" : "L'enllaz públicu va caducar enantes de {days} díes dende la so creación",
"Link" : "Enllaz",
"Password protect" : "Protexer con contraseña",
"Password" : "Contraseña",
"Choose a password for the public link" : "Escueyi una contraseña pal enllaz públicu",
"Allow editing" : "Permitir edición",
"Email link to person" : "Enllaz de corréu-e a la persona",
"Send" : "Unviar",
"Set expiration date" : "Afitar la data de caducidá",
"Expiration" : "Caducidá",
"Expiration date" : "Data de caducidá",
"An error occured. Please try again" : "Hebo un fallu. Por favor, inténtalo dempués. ",
"Adding user..." : "Amestando usuariu...",
"remote" : "remotu",
"Resharing is not allowed" : "Recompartir nun ta permitíu",
"Shared in {item} with {user}" : "Compartíu en {item} con {user}",
"Unshare" : "Dexar de compartir",
"notify by email" : "notificar per corréu",
"access control" : "control d'accesu",
"create" : "crear",
"change" : "camudar",
"delete" : "desaniciar",
"Password protected" : "Contraseña protexida",
"Error unsetting expiration date" : "Fallu desafitando la data de caducidá",
Expand Down Expand Up @@ -176,6 +187,7 @@ OC.L10N.register(
"Clear cache for repeating events" : "Llimpiar caché d'eventos recurrentes",
"Primary CalDAV address" : "Direición de calendariu CalDAV primariu",
"iOS/OS X CalDAV address" : "Direición de calendariu CalDAV iOS/OSX",
"Contacts' birthdays CalDAV address" : "Direición CalDAV de los cumpleaños de los contautos",
"Share Calendar" : "Compartir calendariu",
"Download" : "Descargar",
"Edit" : "Editar",
Expand Down
12 changes: 12 additions & 0 deletions l10n/ast.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,8 @@
"The file contained either no events or all events are already saved in your calendar." : "El ficheru nun contién eventos o yá esisten nel to calendariu.",
"events have been saved in the new calendar" : "los eventos guardáronse nel nuevu calendariu",
"Import failed" : "Falló la importación",
"_%n event has been saved in the new calendar %s._::_%n events have been saved in the new calendar %s._" : ["Los eventos %n guardáronse nel nuevu calendariu %s.","Los eventos %n guardáronse nel nuevu calendariu %s."],
"_%n event has been saved in your calendar._::_%n events have been saved in your calendar._" : ["Los eventos %n guardáronse nel to calendariu","Los eventos %n guardáronse nel to calendariu"],
"New Timezone:" : "Nueva estaya horaria:",
"Timezone changed" : "Estaya horaria cambiada",
"Invalid request" : "Solicitú non válida",
Expand Down Expand Up @@ -83,23 +85,32 @@
"Error while changing permissions" : "Fallu mientres camudaben los permisos",
"Shared with you and the group {group} by {owner}" : "Compartíu contigo y col grupu {group} por {owner}",
"Shared with you by {owner}" : "Compartíu contigo por {owner}",
"Share with users or groups …" : "Compartir con usuarios o grupos",
"Share with users, groups or remote users …" : "Compartir con usuarios, grupos o usuarios remotos",
"Share" : "Compartir",
"Share with people on other ownClouds using the syntax [email protected]/owncloud" : "Compartir con xente d'otros ownClouds usando la sintaxis [email protected]/owncloud",
"Share link" : "Compartir enllaz",
"The public link will expire no later than {days} days after it is created" : "L'enllaz públicu va caducar enantes de {days} díes dende la so creación",
"Link" : "Enllaz",
"Password protect" : "Protexer con contraseña",
"Password" : "Contraseña",
"Choose a password for the public link" : "Escueyi una contraseña pal enllaz públicu",
"Allow editing" : "Permitir edición",
"Email link to person" : "Enllaz de corréu-e a la persona",
"Send" : "Unviar",
"Set expiration date" : "Afitar la data de caducidá",
"Expiration" : "Caducidá",
"Expiration date" : "Data de caducidá",
"An error occured. Please try again" : "Hebo un fallu. Por favor, inténtalo dempués. ",
"Adding user..." : "Amestando usuariu...",
"remote" : "remotu",
"Resharing is not allowed" : "Recompartir nun ta permitíu",
"Shared in {item} with {user}" : "Compartíu en {item} con {user}",
"Unshare" : "Dexar de compartir",
"notify by email" : "notificar per corréu",
"access control" : "control d'accesu",
"create" : "crear",
"change" : "camudar",
"delete" : "desaniciar",
"Password protected" : "Contraseña protexida",
"Error unsetting expiration date" : "Fallu desafitando la data de caducidá",
Expand Down Expand Up @@ -174,6 +185,7 @@
"Clear cache for repeating events" : "Llimpiar caché d'eventos recurrentes",
"Primary CalDAV address" : "Direición de calendariu CalDAV primariu",
"iOS/OS X CalDAV address" : "Direición de calendariu CalDAV iOS/OSX",
"Contacts' birthdays CalDAV address" : "Direición CalDAV de los cumpleaños de los contautos",
"Share Calendar" : "Compartir calendariu",
"Download" : "Descargar",
"Edit" : "Editar",
Expand Down
12 changes: 12 additions & 0 deletions l10n/ast.php
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,8 @@
"The file contained either no events or all events are already saved in your calendar." => "El ficheru nun contién eventos o yá esisten nel to calendariu.",
"events have been saved in the new calendar" => "los eventos guardáronse nel nuevu calendariu",
"Import failed" => "Falló la importación",
"_%n event has been saved in the new calendar %s._::_%n events have been saved in the new calendar %s._" => array("Los eventos %n guardáronse nel nuevu calendariu %s.","Los eventos %n guardáronse nel nuevu calendariu %s."),
"_%n event has been saved in your calendar._::_%n events have been saved in your calendar._" => array("Los eventos %n guardáronse nel to calendariu","Los eventos %n guardáronse nel to calendariu"),
"New Timezone:" => "Nueva estaya horaria:",
"Timezone changed" => "Estaya horaria cambiada",
"Invalid request" => "Solicitú non válida",
Expand Down Expand Up @@ -84,23 +86,32 @@
"Error while changing permissions" => "Fallu mientres camudaben los permisos",
"Shared with you and the group {group} by {owner}" => "Compartíu contigo y col grupu {group} por {owner}",
"Shared with you by {owner}" => "Compartíu contigo por {owner}",
"Share with users or groups …" => "Compartir con usuarios o grupos",
"Share with users, groups or remote users …" => "Compartir con usuarios, grupos o usuarios remotos",
"Share" => "Compartir",
"Share with people on other ownClouds using the syntax [email protected]/owncloud" => "Compartir con xente d'otros ownClouds usando la sintaxis [email protected]/owncloud",
"Share link" => "Compartir enllaz",
"The public link will expire no later than {days} days after it is created" => "L'enllaz públicu va caducar enantes de {days} díes dende la so creación",
"Link" => "Enllaz",
"Password protect" => "Protexer con contraseña",
"Password" => "Contraseña",
"Choose a password for the public link" => "Escueyi una contraseña pal enllaz públicu",
"Allow editing" => "Permitir edición",
"Email link to person" => "Enllaz de corréu-e a la persona",
"Send" => "Unviar",
"Set expiration date" => "Afitar la data de caducidá",
"Expiration" => "Caducidá",
"Expiration date" => "Data de caducidá",
"An error occured. Please try again" => "Hebo un fallu. Por favor, inténtalo dempués. ",
"Adding user..." => "Amestando usuariu...",
"remote" => "remotu",
"Resharing is not allowed" => "Recompartir nun ta permitíu",
"Shared in {item} with {user}" => "Compartíu en {item} con {user}",
"Unshare" => "Dexar de compartir",
"notify by email" => "notificar per corréu",
"access control" => "control d'accesu",
"create" => "crear",
"change" => "camudar",
"delete" => "desaniciar",
"Password protected" => "Contraseña protexida",
"Error unsetting expiration date" => "Fallu desafitando la data de caducidá",
Expand Down Expand Up @@ -175,6 +186,7 @@
"Clear cache for repeating events" => "Llimpiar caché d'eventos recurrentes",
"Primary CalDAV address" => "Direición de calendariu CalDAV primariu",
"iOS/OS X CalDAV address" => "Direición de calendariu CalDAV iOS/OSX",
"Contacts' birthdays CalDAV address" => "Direición CalDAV de los cumpleaños de los contautos",
"Share Calendar" => "Compartir calendariu",
"Download" => "Descargar",
"Edit" => "Editar",
Expand Down
3 changes: 3 additions & 0 deletions l10n/da.js
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,8 @@ OC.L10N.register(
"The file contained either no events or all events are already saved in your calendar." : "Enten indeholdte filen ingen begivenheder, eller også er alle begivenheder allerede gemt i din kalender.",
"events have been saved in the new calendar" : "begivenheder er blevet gemt i den nye kalender",
"Import failed" : "Import mislykkedes",
"_%n event has been saved in the new calendar %s._::_%n events have been saved in the new calendar %s._" : ["%n begivenhed er blevet gemt i den nye kalender %s.","%n begivenheder er blevet gemt i den nye kalender %s."],
"_%n event has been saved in your calendar._::_%n events have been saved in your calendar._" : ["%n begivenhed er blevet gemt i din kalender.","%n begivenheder er blevet gemt i din kalender."],
"New Timezone:" : "Ny tidszone:",
"Timezone changed" : "Tidszone ændret",
"Invalid request" : "Ugyldig forespørgsel",
Expand Down Expand Up @@ -185,6 +187,7 @@ OC.L10N.register(
"Clear cache for repeating events" : "Ryd cache for gentagende begivenheder",
"Primary CalDAV address" : "Primær CalDAV-adresse",
"iOS/OS X CalDAV address" : "iOS/OS X CalDAV-adresse",
"Contacts' birthdays CalDAV address" : "Kontakters fødselsdags CalDAV adresse",
"Share Calendar" : "Del kalender",
"Download" : "Hent",
"Edit" : "Redigér",
Expand Down
3 changes: 3 additions & 0 deletions l10n/da.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,8 @@
"The file contained either no events or all events are already saved in your calendar." : "Enten indeholdte filen ingen begivenheder, eller også er alle begivenheder allerede gemt i din kalender.",
"events have been saved in the new calendar" : "begivenheder er blevet gemt i den nye kalender",
"Import failed" : "Import mislykkedes",
"_%n event has been saved in the new calendar %s._::_%n events have been saved in the new calendar %s._" : ["%n begivenhed er blevet gemt i den nye kalender %s.","%n begivenheder er blevet gemt i den nye kalender %s."],
"_%n event has been saved in your calendar._::_%n events have been saved in your calendar._" : ["%n begivenhed er blevet gemt i din kalender.","%n begivenheder er blevet gemt i din kalender."],
"New Timezone:" : "Ny tidszone:",
"Timezone changed" : "Tidszone ændret",
"Invalid request" : "Ugyldig forespørgsel",
Expand Down Expand Up @@ -183,6 +185,7 @@
"Clear cache for repeating events" : "Ryd cache for gentagende begivenheder",
"Primary CalDAV address" : "Primær CalDAV-adresse",
"iOS/OS X CalDAV address" : "iOS/OS X CalDAV-adresse",
"Contacts' birthdays CalDAV address" : "Kontakters fødselsdags CalDAV adresse",
"Share Calendar" : "Del kalender",
"Download" : "Hent",
"Edit" : "Redigér",
Expand Down
3 changes: 3 additions & 0 deletions l10n/da.php
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,8 @@
"The file contained either no events or all events are already saved in your calendar." => "Enten indeholdte filen ingen begivenheder, eller også er alle begivenheder allerede gemt i din kalender.",
"events have been saved in the new calendar" => "begivenheder er blevet gemt i den nye kalender",
"Import failed" => "Import mislykkedes",
"_%n event has been saved in the new calendar %s._::_%n events have been saved in the new calendar %s._" => array("%n begivenhed er blevet gemt i den nye kalender %s.","%n begivenheder er blevet gemt i den nye kalender %s."),
"_%n event has been saved in your calendar._::_%n events have been saved in your calendar._" => array("%n begivenhed er blevet gemt i din kalender.","%n begivenheder er blevet gemt i din kalender."),
"New Timezone:" => "Ny tidszone:",
"Timezone changed" => "Tidszone ændret",
"Invalid request" => "Ugyldig forespørgsel",
Expand Down Expand Up @@ -184,6 +186,7 @@
"Clear cache for repeating events" => "Ryd cache for gentagende begivenheder",
"Primary CalDAV address" => "Primær CalDAV-adresse",
"iOS/OS X CalDAV address" => "iOS/OS X CalDAV-adresse",
"Contacts' birthdays CalDAV address" => "Kontakters fødselsdags CalDAV adresse",
"Share Calendar" => "Del kalender",
"Download" => "Hent",
"Edit" => "Redigér",
Expand Down
1 change: 1 addition & 0 deletions l10n/es.js
Original file line number Diff line number Diff line change
Expand Up @@ -187,6 +187,7 @@ OC.L10N.register(
"Clear cache for repeating events" : "Limpiar caché de eventos recurrentes",
"Primary CalDAV address" : "Direccion de calendario CalDAV primario",
"iOS/OS X CalDAV address" : "Direccion de calendario CalDAV iOS/OSX",
"Contacts' birthdays CalDAV address" : "Dirección CalDAV de cumpleaños del contacto",
"Share Calendar" : "Compartir calendario",
"Download" : "Descargar",
"Edit" : "Editar",
Expand Down
1 change: 1 addition & 0 deletions l10n/es.json
Original file line number Diff line number Diff line change
Expand Up @@ -185,6 +185,7 @@
"Clear cache for repeating events" : "Limpiar caché de eventos recurrentes",
"Primary CalDAV address" : "Direccion de calendario CalDAV primario",
"iOS/OS X CalDAV address" : "Direccion de calendario CalDAV iOS/OSX",
"Contacts' birthdays CalDAV address" : "Dirección CalDAV de cumpleaños del contacto",
"Share Calendar" : "Compartir calendario",
"Download" : "Descargar",
"Edit" : "Editar",
Expand Down
1 change: 1 addition & 0 deletions l10n/es.php
Original file line number Diff line number Diff line change
Expand Up @@ -186,6 +186,7 @@
"Clear cache for repeating events" => "Limpiar caché de eventos recurrentes",
"Primary CalDAV address" => "Direccion de calendario CalDAV primario",
"iOS/OS X CalDAV address" => "Direccion de calendario CalDAV iOS/OSX",
"Contacts' birthdays CalDAV address" => "Dirección CalDAV de cumpleaños del contacto",
"Share Calendar" => "Compartir calendario",
"Download" => "Descargar",
"Edit" => "Editar",
Expand Down
Loading