summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--app/views/route_elements/_index_core.html.haml40
-rw-r--r--app/views/route_elements/show.html.haml54
-rw-r--r--db/schema.rb48
3 files changed, 90 insertions, 52 deletions
diff --git a/app/views/route_elements/_index_core.html.haml b/app/views/route_elements/_index_core.html.haml
index a88602f..b7d2bc1 100644
--- a/app/views/route_elements/_index_core.html.haml
+++ b/app/views/route_elements/_index_core.html.haml
@@ -3,12 +3,22 @@
%tr
- if route_elements.count > 1
%th
- %th= t('route_elements.index.var_in')
- %th= t('route_elements.index.var_out')
+ %th
+ %span.hidden-phone
+ = t('route_elements.index.var_in')
+ %th
+ %span.hidden-phone
+ = t('route_elements.index.var_out')
%th= t('route_elements.index.pattern')
- %th= t('route_elements.index.replacement')
- %th= t('route_elements.index.action')
- %th= t('route_elements.index.mandatory')
+ %th
+ %span.hidden-phone
+ = t('route_elements.index.replacement')
+ %th
+ %span.hidden-phone
+ = t('route_elements.index.action')
+ %th
+ %span.hidden-phone
+ = t('route_elements.index.mandatory')
%tbody{ :id => "route_elements", :'data-update-url' => sort_call_route_route_elements_url(route_elements.first.call_route)}
- for route_element in route_elements
@@ -17,10 +27,20 @@
%td
%span.handle
%i.icon-resize-vertical
- %td= route_element.var_in
- %td= route_element.var_out
+ %td
+ %span.hidden-phone
+ = route_element.var_in
+ %td
+ %span.hidden-phone
+ = route_element.var_out
%td= route_element.pattern
- %td= route_element.replacement
- %td= route_element.action
- %td= route_element.mandatory
+ %td
+ %span.hidden-phone
+ = route_element.replacement
+ %td
+ %span.hidden-phone
+ = route_element.action
+ %td
+ %span.hidden-phone
+ = route_element.mandatory
=render :partial => 'shared/index_view_edit_destroy_part', :locals => {:parent => @call_route, :child => route_element} \ No newline at end of file
diff --git a/app/views/route_elements/show.html.haml b/app/views/route_elements/show.html.haml
index 1d07cbc..937df5e 100644
--- a/app/views/route_elements/show.html.haml
+++ b/app/views/route_elements/show.html.haml
@@ -1,25 +1,37 @@
- content_for :title, t("route_elements.show.page_title")
-%p
- %strong= t('route_elements.show.position') + ":"
- = @route_element.position
-%p
- %strong= t('route_elements.show.var_in') + ":"
- = @route_element.var_in
-%p
- %strong= t('route_elements.show.var_out') + ":"
- = @route_element.var_out
-%p
- %strong= t('route_elements.show.pattern') + ":"
- = @route_element.pattern
-%p
- %strong= t('route_elements.show.replacement') + ":"
- = @route_element.replacement
-%p
- %strong= t('route_elements.show.action') + ":"
- = @route_element.action
-%p
- %strong= t('route_elements.show.mandatory') + ":"
- = @route_element.mandatory
+.row
+ .span6
+ %table.table.table-striped
+ %tr
+ %td
+ %strong= t('route_elements.show.var_in') + ":"
+ %td
+ = @route_element.var_in
+ %tr
+ %td
+ %strong= t('route_elements.show.var_out') + ":"
+ %td
+ = @route_element.var_out
+ %tr
+ %td
+ %strong= t('route_elements.show.pattern') + ":"
+ %td
+ = @route_element.pattern
+ %tr
+ %td
+ %strong= t('route_elements.show.replacement') + ":"
+ %td
+ = @route_element.replacement
+ %tr
+ %td
+ %strong= t('route_elements.show.action') + ":"
+ %td
+ = @route_element.action
+ %tr
+ %td
+ %strong= t('route_elements.show.mandatory') + ":"
+ %td
+ = @route_element.mandatory
= render :partial => 'shared/show_edit_destroy_part', :locals => {:parent => @call_route, :child => @route_element } \ No newline at end of file
diff --git a/db/schema.rb b/db/schema.rb
index 5e51305..fc2b635 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -11,7 +11,7 @@
#
# It's strongly recommended to check this file into your version control system.
-ActiveRecord::Schema.define(:version => 20130206144829) do
+ActiveRecord::Schema.define(:version => 20130212071000) do
create_table "access_authorizations", :force => true do |t|
t.string "access_authorizationable_type"
@@ -129,21 +129,11 @@ ActiveRecord::Schema.define(:version => 20130206144829) do
t.datetime "finished_at"
t.string "state"
t.string "directory"
- t.integer "size_of_the_backup"
- t.datetime "created_at", :null => false
- t.datetime "updated_at", :null => false
+ t.datetime "created_at", :null => false
+ t.datetime "updated_at", :null => false
t.string "backup_file"
end
- create_table "backups", :force => true do |t|
- t.datetime "start_at"
- t.datetime "end_at"
- t.string "directory"
- t.string "size"
- t.datetime "created_at", :null => false
- t.datetime "updated_at", :null => false
- end
-
create_table "call_forward_cases", :force => true do |t|
t.string "value"
t.datetime "created_at", :null => false
@@ -656,6 +646,28 @@ ActiveRecord::Schema.define(:version => 20130206144829) do
t.string "hostname", :limit => 256
end
+ create_table "intruders", :force => true do |t|
+ t.string "list_type"
+ t.string "key"
+ t.integer "points"
+ t.integer "bans"
+ t.datetime "ban_last"
+ t.datetime "ban_end"
+ t.string "contact_ip"
+ t.integer "contact_port"
+ t.integer "contact_count"
+ t.datetime "contact_last"
+ t.float "contacts_per_second"
+ t.float "contacts_per_second_max"
+ t.string "user_agent"
+ t.string "to_user"
+ t.string "comment"
+ t.datetime "created_at", :null => false
+ t.datetime "updated_at", :null => false
+ end
+
+ add_index "intruders", ["key"], :name => "index_intruders_on_key", :unique => true
+
create_table "languages", :force => true do |t|
t.string "name"
t.string "code"
@@ -961,15 +973,9 @@ ActiveRecord::Schema.define(:version => 20130206144829) do
t.datetime "updated_at", :null => false
t.integer "sip_account_id"
t.integer "softkey_function_id"
- t.integer "call_forward_id"
t.string "uuid"
- end
-
- create_table "system_messages", :force => true do |t|
- t.integer "user_id"
- t.string "content"
- t.datetime "created_at", :null => false
- t.datetime "updated_at", :null => false
+ t.string "softkeyable_type"
+ t.integer "softkeyable_id"
end
create_table "tasks", :id => false, :force => true do |t|