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

Fix some visual bugs #1741

Closed
wants to merge 2 commits into from
Closed
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
2 changes: 1 addition & 1 deletion js/activity-adminSettings.mjs
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
/*! third party licenses: js/vendor.LICENSE.txt */
import{V as n,t as m,a as d}from"./index-BK2GMarY.mjs";import{N as o,m as s,a as c,A as p,V as u,s as a}from"./settings-store-FiNT_RlZ.mjs";import{x as g,b as l}from"./NcCheckboxRadioSwitch-D2GbHtCS-C8gN2dlh.mjs";import"./_commonjsHelpers-BdswosdL.mjs";import"./NcNoteCard-BLPU1den-eKDxa369.mjs";import"./logger-CcLDq3iB.mjs";const h={name:"AdminSettings",components:{NcCheckboxRadioSwitch:g,NcSettingsSection:o},computed:{...s({emailEnabled:"emailEnabled"}),settingDescription(){return this.emailEnabled?t("activity","Choose for which activities you want to get an email or push notification."):t("activity","Choose for which activities you want to get a push notification.")}},mounted(){this.setEndpoint({endpoint:"/apps/activity/settings/admin"})},methods:{...c(["setEndpoint","toggleEmailEnabled"])}};var v=function(){var i=this,e=i._self._c;return e("NcSettingsSection",{attrs:{name:i.t("activity","Notification")}},[e("NcCheckboxRadioSwitch",{attrs:{type:"checkbox",checked:i.emailEnabled},on:{"update:checked":function(r){return i.toggleEmailEnabled({emailEnabled:r})}}},[i._v(" "+i._s(i.t("activity","Enable notification emails"))+" ")])],1)},f=[],y=l(h,v,f,!1,null,null,null,null);const E=y.exports,b={name:"DefaultActivitySettings",components:{ActivityGrid:p,NcSettingsSection:o},computed:{...s({emailEnabled:"emailEnabled"})},mounted(){this.setEndpoint({endpoint:"/apps/activity/settings/admin"})},methods:{...c(["setEndpoint","toggleEmailEnabled"])}};var S=function(){var i=this,e=i._self._c;return e("NcSettingsSection",{attrs:{name:i.t("activity","Default settings"),description:i.t("activity","Configure the default notification settings for new accounts.")}},[e("ActivityGrid")],1)},w=[],N=l(b,S,w,!1,null,null,null,null);const A=N.exports;n.prototype.t=m,n.prototype.n=d,n.use(u),new n({el:"#activity-admin-settings",store:a,name:"ActivityPersonalSettings",render:i=>i(E)}),new n({el:"#activity-default-settings",store:a,name:"ActivityDefaultSettings",render:i=>i(A)});
import{V as n,t as m,a as d}from"./index-BK2GMarY.mjs";import{N as o,m as s,a as c,A as p,V as u,s as a}from"./settings-store-jBhw-TQN.mjs";import{x as g,b as l}from"./NcCheckboxRadioSwitch-D2GbHtCS-C8gN2dlh.mjs";import"./_commonjsHelpers-BdswosdL.mjs";import"./NcNoteCard-BLPU1den-eKDxa369.mjs";import"./logger-CcLDq3iB.mjs";const h={name:"AdminSettings",components:{NcCheckboxRadioSwitch:g,NcSettingsSection:o},computed:{...s({emailEnabled:"emailEnabled"}),settingDescription(){return this.emailEnabled?t("activity","Choose for which activities you want to get an email or push notification."):t("activity","Choose for which activities you want to get a push notification.")}},mounted(){this.setEndpoint({endpoint:"/apps/activity/settings/admin"})},methods:{...c(["setEndpoint","toggleEmailEnabled"])}};var v=function(){var i=this,e=i._self._c;return e("NcSettingsSection",{attrs:{name:i.t("activity","Notification")}},[e("NcCheckboxRadioSwitch",{attrs:{type:"checkbox",checked:i.emailEnabled},on:{"update:checked":function(r){return i.toggleEmailEnabled({emailEnabled:r})}}},[i._v(" "+i._s(i.t("activity","Enable notification emails"))+" ")])],1)},f=[],y=l(h,v,f,!1,null,null,null,null);const E=y.exports,b={name:"DefaultActivitySettings",components:{ActivityGrid:p,NcSettingsSection:o},computed:{...s({emailEnabled:"emailEnabled"})},mounted(){this.setEndpoint({endpoint:"/apps/activity/settings/admin"})},methods:{...c(["setEndpoint","toggleEmailEnabled"])}};var S=function(){var i=this,e=i._self._c;return e("NcSettingsSection",{attrs:{name:i.t("activity","Default settings"),description:i.t("activity","Configure the default notification settings for new accounts.")}},[e("ActivityGrid")],1)},w=[],N=l(b,S,w,!1,null,null,null,null);const A=N.exports;n.prototype.t=m,n.prototype.n=d,n.use(u),new n({el:"#activity-admin-settings",store:a,name:"ActivityPersonalSettings",render:i=>i(E)}),new n({el:"#activity-default-settings",store:a,name:"ActivityDefaultSettings",render:i=>i(A)});
2 changes: 1 addition & 1 deletion js/activity-personalSettings.mjs
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
(function(){"use strict";try{if(typeof document<"u"){var e=document.createElement("style");e.appendChild(document.createTextNode(".activity-frequency__label[data-v-778e414b]{margin-top:24px;display:inline-block}.notification-frequency__select[data-v-778e414b]{margin-left:calc(var(--default-grid-baseline) * 2)}")),document.head.appendChild(e)}}catch(t){console.error("vite-plugin-css-injected-by-js",t)}})();
/*! third party licenses: js/vendor.LICENSE.txt */
import{V as a,t as m,a as u}from"./index-BK2GMarY.mjs";import{m as s,a as c,N as r,A as y,V as E,s as l}from"./settings-store-FiNT_RlZ.mjs";import{b as o,x as _}from"./NcCheckboxRadioSwitch-D2GbHtCS-C8gN2dlh.mjs";import"./_commonjsHelpers-BdswosdL.mjs";import"./NcNoteCard-BLPU1den-eKDxa369.mjs";import"./logger-CcLDq3iB.mjs";const v={EmailFrequency:{EMAIL_SEND_HOURLY:0,EMAIL_SEND_DAILY:1,EMAIL_SEND_WEEKLY:2,EMAIL_SEND_ASAP:3}},d={name:"EmailSettings",data(){return{EmailFrequency:v.EmailFrequency}},computed:{...s(["emailEnabled","isEmailSet","settingBatchtime"])},methods:{...c(["setSettingBatchtime"])}};var g=function(){var e=this,i=e._self._c;return e.emailEnabled?i("div",[e.isEmailSet?e._e():i("p",[i("strong",[e._v(e._s(e.t("activity","You need to set up your email address before you can receive notification emails.")))])]),i("p",[i("label",{staticClass:"activity-frequency__label",attrs:{for:"activity_setting_batchtime"}},[e._v(" "+e._s(e.t("activity","Send activity emails"))+" ")]),i("select",{staticClass:"notification-frequency__select",attrs:{id:"activity_setting_batchtime",name:"activity_setting_batchtime"},on:{change:function(n){return e.setSettingBatchtime({settingBatchtime:n.target.value})}}},[i("option",{domProps:{value:e.EmailFrequency.EMAIL_SEND_ASAP,selected:e.settingBatchtime===e.EmailFrequency.EMAIL_SEND_ASAP}},[e._v(" "+e._s(e.t("activity","As soon as possible"))+" ")]),i("option",{domProps:{value:e.EmailFrequency.EMAIL_SEND_HOURLY,selected:e.settingBatchtime===e.EmailFrequency.EMAIL_SEND_HOURLY}},[e._v(" "+e._s(e.t("activity","Hourly"))+" ")]),i("option",{domProps:{value:e.EmailFrequency.EMAIL_SEND_DAILY,selected:e.settingBatchtime===e.EmailFrequency.EMAIL_SEND_DAILY}},[e._v(" "+e._s(e.t("activity","Daily"))+" ")]),i("option",{domProps:{value:e.EmailFrequency.EMAIL_SEND_WEEKLY,selected:e.settingBatchtime===e.EmailFrequency.EMAIL_SEND_WEEKLY}},[e._v(" "+e._s(e.t("activity","Weekly"))+" ")])])])]):e._e()},p=[],S=o(d,g,p,!1,null,"778e414b",null,null);const h=S.exports,A={name:"UserSettings",components:{NcSettingsSection:r,EmailSettings:h,ActivityGrid:y},computed:{...s({emailEnabled:"emailEnabled"}),settingDescription(){return this.emailEnabled?t("activity","Choose for which activities you want to get an email or push notification."):t("activity","Choose for which activities you want to get a push notification.")}},mounted(){this.setEndpoint({endpoint:"/apps/activity/settings"})},methods:{...c(["setEndpoint","toggleEmailEnabled"])}};var D=function(){var e=this,i=e._self._c;return i("NcSettingsSection",{attrs:{name:e.t("activity","Activity"),description:e.settingDescription}},[i("ActivityGrid"),i("EmailSettings")],1)},b=[],f=o(A,D,b,!1,null,null,null,null);const L=f.exports,N={name:"DailySummary",components:{NcCheckboxRadioSwitch:_,NcSettingsSection:r},computed:{...s(["activityDigestEnabled"])},mounted(){this.setEndpoint({endpoint:"/apps/activity/settings"})},methods:{...c(["setEndpoint","toggleActivityDigestEnabled"])}};var I=function(){var e=this,i=e._self._c;return i("NcSettingsSection",{attrs:{name:e.t("activity","Daily activity summary")}},[i("NcCheckboxRadioSwitch",{attrs:{"data-cy-checkbox":"",checked:e.activityDigestEnabled},on:{"update:checked":function(n){return e.toggleActivityDigestEnabled({activityDigestEnabled:n})}}},[e._v(" "+e._s(e.t("activity","Send daily activity summary in the morning"))+" ")])],1)},q=[],M=o(N,I,q,!1,null,null,null,null);const F=M.exports;a.prototype.t=m,a.prototype.n=u,a.use(E),new a({el:"#activity-user-settings",store:l,name:"ActivityPersonalSettings",render:e=>e(L)}),new a({el:"#activity-digest-user-settings",name:"ActivityDigestPersonalSettings",store:l,render:e=>e(F)});
import{V as a,t as m,a as u}from"./index-BK2GMarY.mjs";import{m as s,a as c,N as r,A as y,V as E,s as l}from"./settings-store-jBhw-TQN.mjs";import{b as o,x as _}from"./NcCheckboxRadioSwitch-D2GbHtCS-C8gN2dlh.mjs";import"./_commonjsHelpers-BdswosdL.mjs";import"./NcNoteCard-BLPU1den-eKDxa369.mjs";import"./logger-CcLDq3iB.mjs";const v={EmailFrequency:{EMAIL_SEND_HOURLY:0,EMAIL_SEND_DAILY:1,EMAIL_SEND_WEEKLY:2,EMAIL_SEND_ASAP:3}},d={name:"EmailSettings",data(){return{EmailFrequency:v.EmailFrequency}},computed:{...s(["emailEnabled","isEmailSet","settingBatchtime"])},methods:{...c(["setSettingBatchtime"])}};var g=function(){var e=this,i=e._self._c;return e.emailEnabled?i("div",[e.isEmailSet?e._e():i("p",[i("strong",[e._v(e._s(e.t("activity","You need to set up your email address before you can receive notification emails.")))])]),i("p",[i("label",{staticClass:"activity-frequency__label",attrs:{for:"activity_setting_batchtime"}},[e._v(" "+e._s(e.t("activity","Send activity emails"))+" ")]),i("select",{staticClass:"notification-frequency__select",attrs:{id:"activity_setting_batchtime",name:"activity_setting_batchtime"},on:{change:function(n){return e.setSettingBatchtime({settingBatchtime:n.target.value})}}},[i("option",{domProps:{value:e.EmailFrequency.EMAIL_SEND_ASAP,selected:e.settingBatchtime===e.EmailFrequency.EMAIL_SEND_ASAP}},[e._v(" "+e._s(e.t("activity","As soon as possible"))+" ")]),i("option",{domProps:{value:e.EmailFrequency.EMAIL_SEND_HOURLY,selected:e.settingBatchtime===e.EmailFrequency.EMAIL_SEND_HOURLY}},[e._v(" "+e._s(e.t("activity","Hourly"))+" ")]),i("option",{domProps:{value:e.EmailFrequency.EMAIL_SEND_DAILY,selected:e.settingBatchtime===e.EmailFrequency.EMAIL_SEND_DAILY}},[e._v(" "+e._s(e.t("activity","Daily"))+" ")]),i("option",{domProps:{value:e.EmailFrequency.EMAIL_SEND_WEEKLY,selected:e.settingBatchtime===e.EmailFrequency.EMAIL_SEND_WEEKLY}},[e._v(" "+e._s(e.t("activity","Weekly"))+" ")])])])]):e._e()},p=[],S=o(d,g,p,!1,null,"778e414b",null,null);const h=S.exports,A={name:"UserSettings",components:{NcSettingsSection:r,EmailSettings:h,ActivityGrid:y},computed:{...s({emailEnabled:"emailEnabled"}),settingDescription(){return this.emailEnabled?t("activity","Choose for which activities you want to get an email or push notification."):t("activity","Choose for which activities you want to get a push notification.")}},mounted(){this.setEndpoint({endpoint:"/apps/activity/settings"})},methods:{...c(["setEndpoint","toggleEmailEnabled"])}};var D=function(){var e=this,i=e._self._c;return i("NcSettingsSection",{attrs:{name:e.t("activity","Activity"),description:e.settingDescription}},[i("ActivityGrid"),i("EmailSettings")],1)},b=[],f=o(A,D,b,!1,null,null,null,null);const L=f.exports,N={name:"DailySummary",components:{NcCheckboxRadioSwitch:_,NcSettingsSection:r},computed:{...s(["activityDigestEnabled"])},mounted(){this.setEndpoint({endpoint:"/apps/activity/settings"})},methods:{...c(["setEndpoint","toggleActivityDigestEnabled"])}};var I=function(){var e=this,i=e._self._c;return i("NcSettingsSection",{attrs:{name:e.t("activity","Daily activity summary")}},[i("NcCheckboxRadioSwitch",{attrs:{"data-cy-checkbox":"",checked:e.activityDigestEnabled},on:{"update:checked":function(n){return e.toggleActivityDigestEnabled({activityDigestEnabled:n})}}},[e._v(" "+e._s(e.t("activity","Send daily activity summary in the morning"))+" ")])],1)},q=[],M=o(N,I,q,!1,null,null,null,null);const F=M.exports;a.prototype.t=m,a.prototype.n=u,a.use(E),new a({el:"#activity-user-settings",store:l,name:"ActivityPersonalSettings",render:e=>e(L)}),new a({el:"#activity-digest-user-settings",name:"ActivityDigestPersonalSettings",store:l,render:e=>e(F)});

Large diffs are not rendered by default.

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion js/vendor.LICENSE.txt
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ version: 2.1.0
license: GPL-3.0-or-later

@nextcloud/l10n
version: 2.2.0
version: 3.1.0
license: GPL-3.0-or-later

@nextcloud/logger
Expand Down
8 changes: 8 additions & 0 deletions src/components/ActivityGrid.vue
Original file line number Diff line number Diff line change
Expand Up @@ -102,6 +102,10 @@ table.grid th.activity_select_group {
color: var(--color-main-text);
}

table.grid tr td span {
justify-content: center;
}

.sr-only {
position:absolute;
left:-10000px;
Expand All @@ -110,4 +114,8 @@ table.grid th.activity_select_group {
height:1px;
overflow:hidden;
}

.activity-frequency__label {
margin-right: 10px;
}
</style>
Loading