zydronium/internetee-registry
1
0
Fork 0
mirror of https://github.com/internetee/registry.git synced 2025-08-05 17:28:18 +02:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'master' into registry-569

Browse source
This commit is contained in:
Artur Beljajev 2017-09-28 17:18:14 +03:00
commit 8a04fa793d
30 changed files with 83 additions and 80 deletions
Download patch file Download diff file Expand all files Collapse all files

1
app/assets/javascripts/admin-manifest.coffee
View file

@ -9,6 +9,7 @@
#= require jquery-ui/datepicker
#= require select2
#= require jquery.doubleScroll
#= require datepicker
#= require admin/application
#= require admin/app
#= require_tree ./admin

3
app/assets/javascripts/admin/datepicker.js
View file

@ -1,3 +0,0 @@
$('.datepicker').datepicker({
dateFormat: 'yy-mm-dd'
});

21
app/assets/javascripts/datepicker.js Normal file
View file

@ -0,0 +1,21 @@
(function() {
$.datepicker.setDefaults({
changeMonth: true,
changeYear: true,
duration: 'fast',
firstDay: 1, // Monday
dateFormat: 'yy-mm-dd',
});
function attachDatePicker() {
let dateFields = $('.js-datepicker');
dateFields.datepicker();
}
// For turbolinks
document.addEventListener('page:change', function() {
attachDatePicker();
});
attachDatePicker();
})();

3
app/assets/javascripts/registrant-manifest.coffee
View file

@ -8,7 +8,6 @@
#= require shared/jquery.validate.bootstrap
#= require jquery-ui/datepicker
#= require select2
#= require datepicker
#= require shared/general
#= require registrar/application

3
app/assets/javascripts/registrar-manifest.coffee
View file

@ -6,8 +6,7 @@
#= require jquery.nested_attributes
#= require jquery-ui/datepicker
#= require select2
#= require datepicker
#= require shared/general
#= require registrar/autocomplete
#= require registrar/application

4
app/assets/javascripts/shared/general.coffee
View file

@ -21,10 +21,6 @@ $(document).on 'page:change', ->
tomorrow = new Date(today)
tomorrow.setDate(today.getDate() + 1)
$('.datepicker').datepicker(
dateFormat: "yy-mm-dd"
)
if $('.js-combobox').length
$('.js-combobox').select2
width: "100%"

1
app/assets/stylesheets/admin-manifest.sass
View file

@ -9,6 +9,5 @@
@import typeaheadjs
@import selectize
@import selectize.bootstrap3
// @import bootstrap-datepicker3
@import admin/admin
@import admin/bootstrap-dialog-fix

4
app/views/admin/account_activities/index.haml
View file

@ -24,11 +24,11 @@
.col-md-3
.form-group
= f.label t(:receipt_date_from)
= f.search_field :created_at_gteq, value: params[:q][:created_at_gteq], class: 'form-control datepicker', placeholder: t(:receipt_date_from), autocomplete: 'off'
= f.search_field :created_at_gteq, value: params[:q][:created_at_gteq], class: 'form-control js-datepicker', placeholder: t(:receipt_date_from)
.col-md-3
.form-group
= f.label t(:receipt_date_until)
= f.search_field :created_at_lteq, value: params[:q][:created_at_lteq], class: 'form-control datepicker', placeholder: t(:receipt_date_until), autocomplete: 'off'
= f.search_field :created_at_lteq, value: params[:q][:created_at_lteq], class: 'form-control js-datepicker', placeholder: t(:receipt_date_until)
.col-md-3
.form-group
= label_tag t(:results_per_page)

2
app/views/admin/bank_statements/_form.haml
View file

@ -40,7 +40,7 @@
.form-group
= x.label :paid_at, class: 'col-md-4 control-label required'
.col-md-8
= x.text_field(:paid_at, class: 'form-control datepicker', required: true)
= x.text_field(:paid_at, class: 'form-control js-datepicker', required: true)
%hr
.row

2
app/views/admin/bank_transactions/_form.haml
View file

@ -63,7 +63,7 @@
.form-group
= f.label :paid_at, class: 'col-md-4 control-label required'
.col-md-8
= f.text_field(:paid_at, class: 'form-control datepicker', required: true)
= f.text_field(:paid_at, class: 'form-control js-datepicker', required: true)
%hr
.row

4
app/views/admin/billing/prices/_form.html.erb
View file

@ -42,10 +42,10 @@
<div class="col-sm-6">
<div class="input-group">
<%= f.text_field :valid_from, value: f.object.valid_from.try(:to_s, :dshort),
class: 'form-control datepicker' %>
class: 'form-control js-datepicker' %>
<span class="input-group-addon">-</span>
<%= f.text_field :valid_to, value: f.object.valid_to.try(:to_s, :dshort),
class: 'form-control datepicker' %>
class: 'form-control js-datepicker' %>
</div>
</div>
</div>

4
app/views/admin/blocked_domains/index.haml
View file

@ -13,11 +13,11 @@
.col-md-3
.form-group
= f.label t(:created_at_from)
= f.search_field :created_at_gteq, value: params[:q][:created_at_gteq], class: 'form-control datepicker', placeholder: t(:created_at_from)
= f.search_field :created_at_gteq, value: params[:q][:created_at_gteq], class: 'form-control js-datepicker', placeholder: t(:created_at_from)
.col-md-3
.form-group
= f.label t(:created_at_until)
= f.search_field :created_at_lteq, value: params[:q][:created_at_lteq], class: 'form-control datepicker', placeholder: t(:created_at_until)
= f.search_field :created_at_lteq, value: params[:q][:created_at_lteq], class: 'form-control js-datepicker', placeholder: t(:created_at_until)
.row
.col-md-3
.form-group

6
app/views/admin/contacts/index.haml
View file

@ -41,15 +41,15 @@
.col-md-3
.form-group
= f.label t(:created_at_from)
= f.search_field :created_at_gteq, value: params[:q][:created_at_gteq], class: 'form-control datepicker', placeholder: t(:created_at_from)
= f.search_field :created_at_gteq, value: params[:q][:created_at_gteq], class: 'form-control js-datepicker', placeholder: t(:created_at_from)
.col-md-3
.form-group
= f.label t(:created_at_until)
= f.search_field :created_at_lteq, value: params[:q][:created_at_lteq], class: 'form-control datepicker', placeholder: t(:created_at_until)
= f.search_field :created_at_lteq, value: params[:q][:created_at_lteq], class: 'form-control js-datepicker', placeholder: t(:created_at_until)
.col-md-3
.form-group
= f.label t(:updated_at)
= f.search_field :updated_at_gteq, value: params[:q][:updated_at_gteq], class: 'form-control datepicker', placeholder: t(:updated_at)
= f.search_field :updated_at_gteq, value: params[:q][:updated_at_gteq], class: 'form-control js-datepicker', placeholder: t(:updated_at)
.row
.col-md-6
.form-group

4
app/views/admin/domains/index.haml
View file

@ -28,11 +28,11 @@
.col-md-3
.form-group
= f.label t(:valid_to_from)
= f.search_field :valid_to_gteq, value: params[:q][:valid_to_gteq], class: 'form-control datepicker', placeholder: t(:valid_to_from)
= f.search_field :valid_to_gteq, value: params[:q][:valid_to_gteq], class: 'form-control js-datepicker', placeholder: t(:valid_to_from)
.col-md-3
.form-group
= f.label t(:valid_to_until)
= f.search_field :valid_to_lteq, value: params[:q][:valid_to_lteq], class: 'form-control datepicker', placeholder: t(:valid_to_until)
= f.search_field :valid_to_lteq, value: params[:q][:valid_to_lteq], class: 'form-control js-datepicker', placeholder: t(:valid_to_until)
.row
.col-md-6
.form-group

4
app/views/admin/epp_logs/index.haml
View file

@ -31,11 +31,11 @@
.col-md-3
.form-group
= f.label t(:created_after)
= f.search_field :created_at_gteq, value: params[:q][:created_at_gteq], class: 'form-control datepicker', placeholder: t(:created_after), autocomplete: 'off'
= f.search_field :created_at_gteq, value: params[:q][:created_at_gteq], class: 'form-control js-datepicker', placeholder: t(:created_after)
.col-md-3
.form-group
= f.label t(:created_before)
= f.search_field :created_at_lteq, value: params[:q][:created_at_lteq], class: 'form-control datepicker', placeholder: t(:created_before), autocomplete: 'off'
= f.search_field :created_at_lteq, value: params[:q][:created_at_lteq], class: 'form-control js-datepicker', placeholder: t(:created_before)
.col-md-3{style: 'padding-top: 25px;'}
%button.btn.btn-primary
&nbsp;

4
app/views/admin/repp_logs/index.haml
View file

@ -29,11 +29,11 @@
.col-md-3
.form-group
= f.label t(:created_after)
= f.search_field :created_at_gteq, value: params[:q][:created_at_gteq], class: 'form-control datepicker', placeholder: t(:created_after), autocomplete: 'off'
= f.search_field :created_at_gteq, value: params[:q][:created_at_gteq], class: 'form-control js-datepicker', placeholder: t(:created_after)
.col-md-3
.form-group
= f.label t(:created_before)
= f.search_field :created_at_lteq, value: params[:q][:created_at_lteq], class: 'form-control datepicker', placeholder: t(:created_before), autocomplete: 'off'
= f.search_field :created_at_lteq, value: params[:q][:created_at_lteq], class: 'form-control js-datepicker', placeholder: t(:created_before)
.col-md-3{style: 'padding-top: 25px;'}
%button.btn.btn-primary
&nbsp;

4
app/views/admin/reserved_domains/index.haml
View file

@ -13,11 +13,11 @@
.col-md-3
.form-group
= f.label t(:created_at_from)
= f.search_field :created_at_gteq, value: params[:q][:created_at_gteq], class: 'form-control datepicker', placeholder: t(:created_at_from)
= f.search_field :created_at_gteq, value: params[:q][:created_at_gteq], class: 'form-control js-datepicker', placeholder: t(:created_at_from)
.col-md-3
.form-group
= f.label t(:created_at_until)
= f.search_field :created_at_lteq, value: params[:q][:created_at_lteq], class: 'form-control datepicker', placeholder: t(:created_at_until)
= f.search_field :created_at_lteq, value: params[:q][:created_at_lteq], class: 'form-control js-datepicker', placeholder: t(:created_at_until)
.row
.col-md-3
.form-group

14
app/views/mailers/domain_expire_mailer/expired.html.erb
View file

@ -1,9 +1,11 @@
Domeen <%= @domain.name %> on aegunud<br>
Lugupeetud .ee domeeni kasutaja<br>
<br>
Domeeninimi <%= @domain.name %> on aegunud ja ei ole alates <%= @domain.on_hold_date %> internetis kättesaadav. Alates <%= @domain.delete_date %> on domeen <%= @domain.name %> avatud registreerimiseks kõigile huvilistele.
Domeeninimi <%= @domain.name %> on aegunud ja ei ole alates <%= @domain.on_hold_date %> internetis kättesaadav.
<br>
Alates <%= @domain.delete_date %> on domeen <%= @domain.name %> avatud registreerimiseks kõigile huvilistele.
<br><br>
Domeeni registreeringu pikendamiseks pöörduge palun oma registripidaja:
Domeeni registreeringu pikendamiseks pöörduge palun oma registripidaja poole:
<%= render 'mailers/shared/registrar/registrar.et.html', registrar: @registrar %>
<br><br>
Domeeni <%= @domain.name %> kohta on registris järgmised andmed:
@ -24,7 +26,9 @@ Eesti Interneti Sihtasutus
The <%= @domain.name %> domain has expired<br>
Dear user of .ee domain,<br>
<br>
The domain name <%= @domain.name %> has expired and will not be available on the Internet from <%= @domain.on_hold_date %>. From <%= @domain.delete_date %>, the <%= @domain.name %> domain will be available for registration on a first come first served basis.
The domain name <%= @domain.name %> has expired and will not be available on the Internet from <%= @domain.on_hold_date %>.
<br>
From <%= @domain.delete_date %>, the <%= @domain.name %> domain will be available for registration on a first come first served basis.
<br><br>
To renew the domain registration, please contact your registrar:
<%= render 'mailers/shared/registrar/registrar.en.html', registrar: @registrar %>
@ -48,7 +52,9 @@ Estonian Internet Foundation
Уважаемый пользователь домена .ee<br>
<br>
Доменное имя <%= @domain.name %> устарело и с <%= @domain.on_hold_date %> недоступно в Интернете. С <%= @domain.delete_date %> домен <%= @domain.name %> доступен для регистрации всем желающим по принципу "first come, first served".
Доменное имя <%= @domain.name %> устарело и с <%= @domain.on_hold_date %> недоступно в Интернете.
<br>
С <%= @domain.delete_date %> домен <%= @domain.name %> доступен для регистрации всем желающим по принципу "first come, first served".
<br><br>

11
app/views/mailers/domain_expire_mailer/expired.text.erb
View file

@ -1,9 +1,10 @@
Domeen <%= @domain.name %> on aegunud
Lugupeetud .ee domeeni kasutaja
Domeeninimi <%= @domain.name %> on aegunud ja ei ole alates <%= @domain.on_hold_date %> internetis kättesaadav. Alates <%= @domain.delete_date %> on domeen <%= @domain.name %> avatud registreerimiseks kõigile huvilistele.
Domeeninimi <%= @domain.name %> on aegunud ja ei ole alates <%= @domain.on_hold_date %> internetis kättesaadav.
Alates <%= @domain.delete_date %> on domeen <%= @domain.name %> avatud registreerimiseks kõigile huvilistele.
Domeeni registreeringu pikendamiseks pöörduge palun oma registripidaja:
Domeeni registreeringu pikendamiseks pöörduge palun oma registripidaja poole:
<%= render 'mailers/shared/registrar/registrar.et.text', registrar: @registrar %>
@ -24,7 +25,8 @@ Eesti Interneti Sihtasutus
The <%= @domain.name %> domain has expired
Dear user of .ee domain,
The domain name <%= @domain.name %> has expired and will not be available on the Internet from <%= @domain.on_hold_date %>. From <%= @domain.delete_date %>, the <%= @domain.name %> domain will be available for registration on a first come first served basis.
The domain name <%= @domain.name %> has expired and will not be available on the Internet from <%= @domain.on_hold_date %>.
From <%= @domain.delete_date %>, the <%= @domain.name %> domain will be available for registration on a first come first served basis.
To renew the domain registration, please contact your registrar:
@ -47,7 +49,8 @@ Estonian Internet Foundation
Домен <%= @domain.name %> устарел
Уважаемый пользователь домена .ee
Доменное имя <%= @domain.name %> устарело и с <%= @domain.on_hold_date %> недоступно в Интернете. С <%= @domain.delete_date %> домен <%= @domain.name %> доступен для регистрации всем желающим по принципу "first come, first served".
Доменное имя <%= @domain.name %> устарело и с <%= @domain.on_hold_date %> недоступно в Интернете.
С <%= @domain.delete_date %> домен <%= @domain.name %> доступен для регистрации всем желающим по принципу "first come, first served".
Для продления регистрации домена просим обратиться к своему регистратору:

4
app/views/registrant/domains/index.haml
View file

@ -16,11 +16,11 @@
.col-md-3
.form-group
= f.label t(:valid_to_from)
= f.search_field :valid_to_gteq, value: params[:q][:valid_to_gteq], class: 'form-control datepicker', placeholder: t(:valid_to_from)
= f.search_field :valid_to_gteq, value: params[:q][:valid_to_gteq], class: 'form-control js-datepicker', placeholder: t(:valid_to_from)
.col-md-3
.form-group
= f.label t(:valid_to_until)
= f.search_field :valid_to_lteq, value: params[:q][:valid_to_lteq], class: 'form-control datepicker', placeholder: t(:valid_to_until)
= f.search_field :valid_to_lteq, value: params[:q][:valid_to_lteq], class: 'form-control js-datepicker', placeholder: t(:valid_to_until)
.col-md-3
.form-group
= label_tag t(:results_per_page)

4
app/views/registrar/account_activities/index.haml
View file

@ -20,11 +20,11 @@
.col-md-3
.form-group
= f.label t(:receipt_date_from)
= f.search_field :created_at_gteq, value: params[:q][:created_at_gteq], class: 'form-control datepicker', placeholder: t(:receipt_date_from), autocomplete: 'off'
= f.search_field :created_at_gteq, value: params[:q][:created_at_gteq], class: 'form-control js-datepicker', placeholder: t(:receipt_date_from)
.col-md-3
.form-group
= f.label t(:receipt_date_until)
= f.search_field :created_at_lteq, value: params[:q][:created_at_lteq], class: 'form-control datepicker', placeholder: t(:receipt_date_until), autocomplete: 'off'
= f.search_field :created_at_lteq, value: params[:q][:created_at_lteq], class: 'form-control js-datepicker', placeholder: t(:receipt_date_until)
.col-md-6{style: 'padding-top: 25px;'}
%button.btn.btn-default
&nbsp;

6
app/views/registrar/contacts/index.haml
View file

@ -43,15 +43,15 @@
.col-md-3
.form-group
= f.label t(:created_at_from)
= f.search_field :created_at_gteq, value: params[:q][:created_at_gteq], class: 'form-control datepicker', placeholder: t(:created_at_from)
= f.search_field :created_at_gteq, value: params[:q][:created_at_gteq], class: 'form-control js-datepicker', placeholder: t(:created_at_from)
.col-md-3
.form-group
= f.label t(:created_at_until)
= f.search_field :created_at_lteq, value: params[:q][:created_at_lteq], class: 'form-control datepicker', placeholder: t(:created_at_until)
= f.search_field :created_at_lteq, value: params[:q][:created_at_lteq], class: 'form-control js-datepicker', placeholder: t(:created_at_until)
.col-md-3
.form-group
= f.label t(:updated_at)
= f.search_field :updated_at_gteq, value: params[:q][:updated_at_gteq], class: 'form-control datepicker', placeholder: t(:updated_at)
= f.search_field :updated_at_gteq, value: params[:q][:updated_at_gteq], class: 'form-control js-datepicker', placeholder: t(:updated_at)
.row
.col-md-6
.form-group

4
app/views/registrar/domains/index.haml
View file

@ -34,11 +34,11 @@
.col-md-3
.form-group
= f.label t(:valid_to_from)
= f.search_field :valid_to_gteq, value: params[:q][:valid_to_gteq], class: 'form-control datepicker', placeholder: t(:valid_to_from)
= f.search_field :valid_to_gteq, value: params[:q][:valid_to_gteq], class: 'form-control js-datepicker', placeholder: t(:valid_to_from)
.col-md-3
.form-group
= f.label t(:valid_to_until)
= f.search_field :valid_to_lteq, value: params[:q][:valid_to_lteq], class: 'form-control datepicker', placeholder: t(:valid_to_until)
= f.search_field :valid_to_lteq, value: params[:q][:valid_to_lteq], class: 'form-control js-datepicker', placeholder: t(:valid_to_until)
.row
.col-md-6
.col-md-3

4
app/views/registrar/invoices/index.haml
View file

@ -24,11 +24,11 @@
.col-md-3
.form-group
= f.label t(:due_date_from)
= f.search_field :due_date_gteq, value: params[:q][:due_date_gteq], class: 'form-control datepicker', placeholder: t(:due_date_from), autocomplete: 'off'
= f.search_field :due_date_gteq, value: params[:q][:due_date_gteq], class: 'form-control js-datepicker', placeholder: t(:due_date_from)
.col-md-3
.form-group
= f.label t(:due_date_until)
= f.search_field :due_date_lteq, value: params[:q][:due_date_lteq], class: 'form-control datepicker', placeholder: t(:due_date_until), autocomplete: 'off'
= f.search_field :due_date_lteq, value: params[:q][:due_date_lteq], class: 'form-control js-datepicker', placeholder: t(:due_date_until)
.row
.col-md-3
.form-group