sipwise
/
ngcp-csc-ui
mirror of https://github.com/sipwise/ngcp-csc-ui.git
1
0
Fork 0
Code Issues Releases Wiki Activity

TT#46165 Ensure consistent add and cancel icons

Browse Source 
Change-Id: I96c6c254a4ed9ee42242b169c7c082aed16c8d02
changes/06/24406/3
raxelsen 7 years ago
parent 9d06ca52e5
commit b706d1bc72
10 changed files with 38 additions and 29 deletions
Show Stats Download Patch File Download Diff File

14
src/components/CscSendFax.vue
Unescape View File

@ -58,11 +58,10 @@
{{ $t('communication.label.faxFile') }} {{ $t('communication.label.faxFile') }}
</div> </div>
<q-btn <q-btn
class="upload-button"
flat flat
dark
@click="$refs.faxUpload.click()"
icon="cloud_upload" icon="cloud_upload"
class="upload-button"
@click="$refs.faxUpload.click()"
> >
{{ $t('buttons.select') }} {{ $t('buttons.select') }}
</q-btn> </q-btn>
@ -70,12 +69,11 @@
{{ selectedFile }} {{ selectedFile }}
</span> </span>
<q-btn <q-btn
flat
icon="cancel"
class="reset-button" class="reset-button"
v-if="selectedFile.length > 0" v-if="selectedFile.length > 0"
flat
dark
@click="resetFile" @click="resetFile"
icon-right="cancel"
/> />
</label> </label>
<input <input
@ -97,7 +95,7 @@
</div> </div>
<q-btn <q-btn
flat flat
dark icon="clear"
@click="hideModal" @click="hideModal"
> >
{{ $t('communication.cancel') }} {{ $t('communication.cancel') }}
@ -106,7 +104,7 @@
flat flat
color="primary" color="primary"
@click="sendFax" @click="sendFax"
icon-right="insert drive file" icon="insert drive file"
:disable="formDisabled" :disable="formDisabled"
> >
{{ $t('communication.send') }} {{ $t('communication.send') }}

2
src/components/Login.vue
Unescape View File

@ -21,7 +21,7 @@
</form> </form>
</q-card-main> </q-card-main>
<q-card-actions class="pull-right"> <q-card-actions class="pull-right">
<q-btn flat icon-right="fa-arrow-right" <q-btn flat icon="fa-arrow-right"
color="primary" @click="login()">{{ $t('pages.login.button') }}</q-btn> color="primary" @click="login()">{{ $t('pages.login.button') }}</q-btn>
</q-card-actions> </q-card-actions>
</q-card> </q-card>

8
src/components/pages/CallBlocking/CscCallBlocking.vue
Unescape View File

@ -25,15 +25,15 @@
<div id="add-number-form"> <div id="add-number-form">
<q-field v-if="!addFormEnabled"> <q-field v-if="!addFormEnabled">
<q-btn color="primary" <q-btn color="primary"
icon="fa-plus" flat flat icon="add"
@click="enableAddForm()">{{ $t('pages.callBlocking' + suffix + '.addNumberButton') }}</q-btn> @click="enableAddForm()">{{ $t('pages.callBlocking' + suffix + '.addNumberButton') }}</q-btn>
</q-field> </q-field>
<div v-if="addFormEnabled"> <div v-if="addFormEnabled">
<q-field :error="addFormError" :error-label="$t('pages.callBlocking' + suffix + '.addInputError')"> <q-field :error="addFormError" :error-label="$t('pages.callBlocking' + suffix + '.addInputError')">
<q-input type="text" :float-label="$t('callBlocking.number')" v-model="newNumber" clearable @keyup.enter="addNumber()" /> <q-input type="text" :float-label="$t('callBlocking.number')" v-model="newNumber" clearable @keyup.enter="addNumber()" />
</q-field> </q-field>
<q-btn flat @click="disableAddForm()">{{ $t('buttons.cancel') }}</q-btn> <q-btn flat icon="clear" @click="disableAddForm()">{{ $t('buttons.cancel') }}</q-btn>
<q-btn flat color="primary" icon-right="fa-save" @click="addNumber()">{{ $t('buttons.save') }}</q-btn> <q-btn flat icon="check" color="primary" @click="addNumber()">{{ $t('buttons.save') }}</q-btn>
</div> </div>
</div> </div>
<div> <div>
@ -46,7 +46,7 @@
<q-input autofocus v-if="editing && editingIndex == index" type="text" :float-label="$t('callBlocking.number')" <q-input autofocus v-if="editing && editingIndex == index" type="text" :float-label="$t('callBlocking.number')"
v-model="editingNumber" @keyup.enter="saveNumber(index)" /> v-model="editingNumber" @keyup.enter="saveNumber(index)" />
<q-btn color="primary" flat v-if="editing && editingIndex == index" slot="right" <q-btn color="primary" flat v-if="editing && editingIndex == index" slot="right"
icon="fa-save" @click="saveNumber(index)" class="cursor-pointer"><span class="gt-sm">{{ $t('buttons.save') }}</span></q-btn> icon="check" @click="saveNumber(index)" class="cursor-pointer"><span class="gt-sm">{{ $t('buttons.save') }}</span></q-btn>
<q-btn flat v-if="editing && editingIndex == index" slot="right" <q-btn flat v-if="editing && editingIndex == index" slot="right"
icon="clear" @click="cancelEdit()" class="cursor-pointer"><span class="gt-sm">{{ $t('buttons.cancel') }}</span></q-btn> icon="clear" @click="cancelEdit()" class="cursor-pointer"><span class="gt-sm">{{ $t('buttons.cancel') }}</span></q-btn>
<q-btn color="primary" flat v-if="!(editing && editingIndex == index)" slot="right" <q-btn color="primary" flat v-if="!(editing && editingIndex == index)" slot="right"

6
src/components/pages/CallForward/CscAddDestinationForm.vue
Unescape View File

@ -4,7 +4,7 @@
v-if="!isFormEnabled" v-if="!isFormEnabled"
flat flat
color="primary" color="primary"
icon="fa-plus" icon="add"
> >
{{ $t('pages.callForward.addDestinationButton') }} {{ $t('pages.callForward.addDestinationButton') }}
<q-popover ref="popover"> <q-popover ref="popover">
@ -62,15 +62,15 @@
</q-field> </q-field>
<q-btn <q-btn
flat flat
dark icon="clear"
@click="disableForm()" @click="disableForm()"
> >
{{ $t('buttons.cancel') }} {{ $t('buttons.cancel') }}
</q-btn> </q-btn>
<q-btn <q-btn
flat flat
icon="check"
color="primary" color="primary"
icon-right="fa-save"
@click="addDestination()" @click="addDestination()"
:disable="$v.destinationForm.destination.$error || $v.destinationForm.timeout.$error" :disable="$v.destinationForm.destination.$error || $v.destinationForm.timeout.$error"
> >

13
src/components/pages/CallForward/CscAddTimeForm.vue
Unescape View File

@ -22,10 +22,19 @@
format24h /> format24h />
</q-item-tile> </q-item-tile>
<q-item-tile> <q-item-tile>
<q-btn flat dark @click="disableForm()"> <q-btn
flat
icon="clear"
@click="disableForm()"
>
{{ $t('buttons.cancel') }} {{ $t('buttons.cancel') }}
</q-btn> </q-btn>
<q-btn flat color="primary" icon-right="fa-save" @click="addTime()"> <q-btn
flat
icon="check"
color="primary"
@click="addTime()"
>
{{ $t('buttons.save') }} {{ $t('buttons.save') }}
</q-btn> </q-btn>
</q-item-tile> </q-item-tile>

6
src/components/pages/CallForward/CscCallForwardTime.vue
Unescape View File

@ -108,14 +108,14 @@
html: self.$t('pages.callForward.times.removeLastDialogText'), html: self.$t('pages.callForward.times.removeLastDialogText'),
icon: 'warning', icon: 'warning',
actions: [ actions: [
{
label: self.$t('buttons.cancel')
},
{ {
label: self.$t('buttons.remove'), label: self.$t('buttons.remove'),
handler () { handler () {
store.dispatch('callForward/deleteTimesetById') store.dispatch('callForward/deleteTimesetById')
} }
},
{
label: self.$t('buttons.cancel')
} }
] ]
}); });

3
src/components/pages/CallForward/CscCallForwardTimes.vue
Unescape View File

@ -19,9 +19,10 @@
/> />
<q-btn <q-btn
v-else v-else
flat
icon="add"
color="primary" color="primary"
class="add-time" class="add-time"
icon="fa-plus" flat
@click="enableAddForm()" @click="enableAddForm()"
> >
{{ $t('pages.callForward.times.addTimeButton') }} {{ $t('pages.callForward.times.addTimeButton') }}

5
src/components/pages/CallForward/CscDestinations.vue
Unescape View File

@ -177,13 +177,14 @@
</q-field> </q-field>
<q-btn <q-btn
flat flat
dark icon="clear"
@click="hideModal" @click="hideModal"
> >
{{ $t('buttons.cancel') }} {{ $t('buttons.cancel') }}
</q-btn> </q-btn>
<q-btn <q-btn
flat flat
icon="clear"
color="negative" color="negative"
@click="resetTimeout" @click="resetTimeout"
> >
@ -191,9 +192,9 @@
</q-btn> </q-btn>
<q-btn <q-btn
flat flat
icon="check"
color="primary" color="primary"
@click="updateTimeout" @click="updateTimeout"
icon-right="fa-save"
:disable="$v.editTimeout.$error" :disable="$v.editTimeout.$error"
> >
{{ $t('buttons.save') }} {{ $t('buttons.save') }}

6
src/components/pages/CallForward/CscSourcesets.vue
Unescape View File

@ -19,7 +19,7 @@
slot="title" slot="title"
label="Add new" label="Add new"
name="addnew" name="addnew"
icon="fa-plus" icon="add"
/> />
<q-tab-pane <q-tab-pane
v-for="sourceset in destinations" v-for="sourceset in destinations"
@ -73,7 +73,7 @@
v-if="!sourcesetsFormEnabled" v-if="!sourcesetsFormEnabled"
flat flat
color="primary" color="primary"
icon="fa-plus" icon="add"
@click="openForm()" @click="openForm()"
> >
{{ $t('pages.callForward.sources.addSourceButton') }} {{ $t('pages.callForward.sources.addSourceButton') }}
@ -121,8 +121,8 @@
<q-item-tile> <q-item-tile>
<q-btn <q-btn
flat flat
icon="check"
color="primary" color="primary"
icon-right="fa-save"
@click="addSourceset()" @click="addSourceset()"
:disable="!isValid" :disable="!isValid"
class="sourceset-add-button"> class="sourceset-add-button">

4
src/components/pages/CallForward/CscSourcesetsForm.vue
Unescape View File

@ -10,15 +10,15 @@
</q-field> </q-field>
<q-btn <q-btn
flat flat
dark icon="clear"
@click="disableForm()" @click="disableForm()"
> >
{{ $t('buttons.cancel') }} {{ $t('buttons.cancel') }}
</q-btn> </q-btn>
<q-btn <q-btn
flat flat
icon="check"
color="primary" color="primary"
icon-right="fa-save"
@click="addSource()" @click="addSource()"
:disable="!isValid" :disable="!isValid"
> >

Write Preview
Loading…
Cancel
Save