diff options
| -rw-r--r-- | Gemfile.lock | 18 | ||||
| -rw-r--r-- | app/views/layouts/_footer.html.haml | 37 | ||||
| -rw-r--r-- | app/views/users/show.html.haml | 6 | ||||
| -rw-r--r-- | config/locales/de.yml | 5 | ||||
| -rw-r--r-- | config/locales/en.yml | 3 | ||||
| -rw-r--r-- | db/migrate/20130128121800_create_sip_registrations.rb | 86 | ||||
| -rw-r--r-- | db/schema.rb | 46 |
7 files changed, 127 insertions, 74 deletions
diff --git a/Gemfile.lock b/Gemfile.lock index a1ee949..33e77ff 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -61,7 +61,7 @@ GEM compass (>= 0.12.2, < 0.14) cookiejar (0.3.0) daemons (1.1.9) - dalli (2.6.0) + dalli (2.6.2) delayed_job (3.0.4) activesupport (~> 3.0) delayed_job_active_record (0.3.3) @@ -79,10 +79,10 @@ GEM eventmachine (1.0.0) execjs (1.4.0) multi_json (~> 1.0) - factory_girl (4.1.0) + factory_girl (4.2.0) activesupport (>= 3.0.0) - factory_girl_rails (4.1.0) - factory_girl (~> 4.1.0) + factory_girl_rails (4.2.0) + factory_girl (~> 4.2.0) railties (>= 3.0.0) faye (0.8.8) cookiejar (>= 0.3.0) @@ -93,20 +93,20 @@ GEM yajl-ruby (>= 1.0.0) faye-websocket (0.4.6) eventmachine (>= 0.12.0) - fssm (0.2.9) + fssm (0.2.10) haml (3.1.7) hike (1.2.1) - hirb (0.7.0) + hirb (0.7.1) http_accept_language (1.0.2) http_parser.rb (0.5.3) i18n (0.6.1) inifile (2.0.2) journey (1.0.4) - jquery-rails (2.1.4) + jquery-rails (2.2.0) railties (>= 3.0, < 5.0) thor (>= 0.14, < 2.0) json (1.7.6) - kgio (2.7.4) + kgio (2.8.0) macaddr (1.6.1) systemu (~> 2.5.0) mail (2.4.4) @@ -178,7 +178,7 @@ GEM daemons (>= 1.0.9) eventmachine (>= 0.12.6) rack (>= 1.0.0) - thor (0.16.0) + thor (0.17.0) tilt (1.3.3) treetop (1.4.12) polyglot diff --git a/app/views/layouts/_footer.html.haml b/app/views/layouts/_footer.html.haml index c498943..97bf483 100644 --- a/app/views/layouts/_footer.html.haml +++ b/app/views/layouts/_footer.html.haml @@ -1,18 +1,19 @@ -- cache(['application_footer', I18n.locale]) do - %footer - %ul{:class => 'nav nav-pills'} - - if !GsParameter.get('GEMEINSCHAFT_BUILDNAME').nil? - %li - %a{:href => '#', :rel => "tooltip", :title => "Build ##{GsParameter.get('GEMEINSCHAFT_BUILDNAME')}", :'data-trigger' => 'hover'} - = "Gemeinschaft Version #{GsParameter.get('GEMEINSCHAFT_VERSION')}" - - else - %li - %a{:href => "http://amooma.de/gemeinschaft/gs5"} Gemeinschaft Version #{GsParameter.get('GEMEINSCHAFT_VERSION')} - - if GuiFunction.display?('amooma_commercial_support_link_in_footer', current_user) - %li - %a{:href => "http://amooma.de"} Support und Consulting - - if GuiFunction.display?('gemeinschaft_mailinglist_link_in_footer', current_user) - %li - %a{:href => "https://groups.google.com/group/gs5-users/"} Mailingliste - %li{:class => 'pull-right'} - = link_to 'brought to you by AMOOMA GmbH', 'http://amooma.de'
\ No newline at end of file +%footer + %ul{:class => 'nav nav-pills'} + - if !GsParameter.get('GEMEINSCHAFT_BUILDNAME').nil? + %li + %a{:href => '#', :rel => "tooltip", :title => "Build ##{GsParameter.get('GEMEINSCHAFT_BUILDNAME')}", :'data-trigger' => 'hover'} + = "GS #{GsParameter.get('GEMEINSCHAFT_VERSION')}" + - else + %li + %a{:href => "http://amooma.de/gemeinschaft/gs5"} Gemeinschaft #{GsParameter.get('GEMEINSCHAFT_VERSION')} + - if GuiFunction.display?('amooma_commercial_support_link_in_footer', current_user) + %li + = link_to t('misc.consulting'), "http://amooma.de" + - if GuiFunction.display?('gemeinschaft_mailinglist_link_in_footer', current_user) + %li + = link_to 'GS5 Google Group', "https://groups.google.com/group/gs5-users/" + %li + =link_to t('misc.send_a_bugreport'), URI::escape("https://github.com/amooma/GS5/issues/new?title=Bugreport&body=URL which triggered the bugreport is: #{request.fullpath}\nGS5 buildname: #{(GsParameter.get('GEMEINSCHAFT_BUILDNAME').blank? ? 'unknown' : GsParameter.get('GEMEINSCHAFT_BUILDNAME'))}\n\nPlease provide your bugreport below this line and update the title of this issue to a more specific one.") + %li{:class => 'pull-right'} + = link_to 'brought to you by AMOOMA GmbH', 'http://amooma.de'
\ No newline at end of file diff --git a/app/views/users/show.html.haml b/app/views/users/show.html.haml index 639a52a..c63c791 100644 --- a/app/views/users/show.html.haml +++ b/app/views/users/show.html.haml @@ -16,14 +16,14 @@ %tbody %tr %td - %strong= t('users.show.user_name') + ":" + %strong= truncate(t('users.show.user_name'), :length => 7) + ":" %td = truncate(@user.user_name, :length => 14) %tr %td - %strong= t('users.show.email') + ":" + %strong= truncate(t('users.show.email'), :length => 7) + ":" %td - = truncate(@user.email, :length => 14) + = mail_to @user.email, (Haml::Engine.new("%i.icon-envelope").render + ' ' + truncate(@user.email, :length => 16)) %p.controls = render :partial => 'shared/show_edit_destroy_part', :locals => { :parent => @tenant, :child => @user } diff --git a/config/locales/de.yml b/config/locales/de.yml index e82f513..9d85d8e 100644 --- a/config/locales/de.yml +++ b/config/locales/de.yml @@ -194,4 +194,7 @@ de: long: ! '%A, %d. %B %Y, %H:%M Uhr' short: ! '%d. %B, %H:%M Uhr' pm: nachmittags - date_only: '%d.%m.%Y'
\ No newline at end of file + date_only: '%d.%m.%Y' + misc: + send_a_bugreport: 'Fehler melden (Bugreport).' + consulting: 'Consulting' diff --git a/config/locales/en.yml b/config/locales/en.yml index dab4595..0ad4b1c 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -4,3 +4,6 @@ en: date_only: '%m/%d/%Y' short: ! '%m/%d/%y %H:%M' date_only: '%m/%d/%Y' + misc: + send_a_bugreport: 'Send a bugreport.' + consulting: 'Consulting'
\ No newline at end of file diff --git a/db/migrate/20130128121800_create_sip_registrations.rb b/db/migrate/20130128121800_create_sip_registrations.rb index 4157b84..473418e 100644 --- a/db/migrate/20130128121800_create_sip_registrations.rb +++ b/db/migrate/20130128121800_create_sip_registrations.rb @@ -1,48 +1,50 @@ class CreateSipRegistrations < ActiveRecord::Migration def self.up - create_table :sip_registrations, :id => false do |t| - t.string :call_id, :limit => '255' - t.string :sip_user, :limit => '255' - t.string :sip_host, :limit => '255' - t.string :presence_hosts, :limit => '255' - t.string :contact, :limit => '1024' - t.string :status, :limit => '255' - t.string :rpid, :limit => '255' - t.integer :expires - t.string :user_agent, :limit => '255' - t.string :server_user, :limit => '255' - t.string :server_host, :limit => '255' - t.string :profile_name, :limit => '255' - t.string :hostname, :limit => '255' - t.string :network_ip, :limit => '255' - t.string :network_port, :limit => '6' - t.string :sip_username, :limit => '255' - t.string :sip_realm, :limit => '255' - t.string :mwi_user, :limit => '255' - t.string :mwi_host, :limit => '255' - t.string :orig_server_host, :limit => '255' - t.string :orig_hostname, :limit => '255' - t.string :sub_host, :limit => '255' - end + if !(ActiveRecord::Base.connection.table_exists? 'sip_registrations') + create_table :sip_registrations, :id => false do |t| + t.string :call_id, :limit => '255' + t.string :sip_user, :limit => '255' + t.string :sip_host, :limit => '255' + t.string :presence_hosts, :limit => '255' + t.string :contact, :limit => '1024' + t.string :status, :limit => '255' + t.string :rpid, :limit => '255' + t.integer :expires + t.string :user_agent, :limit => '255' + t.string :server_user, :limit => '255' + t.string :server_host, :limit => '255' + t.string :profile_name, :limit => '255' + t.string :hostname, :limit => '255' + t.string :network_ip, :limit => '255' + t.string :network_port, :limit => '6' + t.string :sip_username, :limit => '255' + t.string :sip_realm, :limit => '255' + t.string :mwi_user, :limit => '255' + t.string :mwi_host, :limit => '255' + t.string :orig_server_host, :limit => '255' + t.string :orig_hostname, :limit => '255' + t.string :sub_host, :limit => '255' + end - add_index :sip_registrations, [ :call_id ], :name => 'sr_call_id' - add_index :sip_registrations, [ :sip_user ], :name => 'sr_sip_user' - add_index :sip_registrations, [ :sip_host ], :name => 'sr_sip_host' - add_index :sip_registrations, [ :sub_host ], :name => 'sr_sub_host' - add_index :sip_registrations, [ :mwi_user ], :name => 'sr_mwi_user' - add_index :sip_registrations, [ :mwi_host ], :name => 'sr_mwi_host' - add_index :sip_registrations, [ :profile_name ], :name => 'sr_profile_name' - add_index :sip_registrations, [ :presence_hosts ], :name => 'sr_presence_hosts' - add_index :sip_registrations, [ :contact ], :name => 'sr_contact' - add_index :sip_registrations, [ :expires ], :name => 'sr_expires' - add_index :sip_registrations, [ :hostname ], :name => 'sr_hostname' - add_index :sip_registrations, [ :status ], :name => 'sr_status' - add_index :sip_registrations, [ :network_ip ], :name => 'sr_network_ip' - add_index :sip_registrations, [ :network_port ], :name => 'sr_network_port' - add_index :sip_registrations, [ :sip_username ], :name => 'sr_sip_username' - add_index :sip_registrations, [ :sip_realm ], :name => 'sr_sip_realm' - add_index :sip_registrations, [ :orig_server_host ], :name => 'sr_orig_server_host' - add_index :sip_registrations, [ :orig_hostname ], :name => 'sr_orig_hostname' + add_index :sip_registrations, [ :call_id ], :name => 'sr_call_id' + add_index :sip_registrations, [ :sip_user ], :name => 'sr_sip_user' + add_index :sip_registrations, [ :sip_host ], :name => 'sr_sip_host' + add_index :sip_registrations, [ :sub_host ], :name => 'sr_sub_host' + add_index :sip_registrations, [ :mwi_user ], :name => 'sr_mwi_user' + add_index :sip_registrations, [ :mwi_host ], :name => 'sr_mwi_host' + add_index :sip_registrations, [ :profile_name ], :name => 'sr_profile_name' + add_index :sip_registrations, [ :presence_hosts ], :name => 'sr_presence_hosts' + add_index :sip_registrations, [ :contact ], :name => 'sr_contact' + add_index :sip_registrations, [ :expires ], :name => 'sr_expires' + add_index :sip_registrations, [ :hostname ], :name => 'sr_hostname' + add_index :sip_registrations, [ :status ], :name => 'sr_status' + add_index :sip_registrations, [ :network_ip ], :name => 'sr_network_ip' + add_index :sip_registrations, [ :network_port ], :name => 'sr_network_port' + add_index :sip_registrations, [ :sip_username ], :name => 'sr_sip_username' + add_index :sip_registrations, [ :sip_realm ], :name => 'sr_sip_realm' + add_index :sip_registrations, [ :orig_server_host ], :name => 'sr_orig_server_host' + add_index :sip_registrations, [ :orig_hostname ], :name => 'sr_orig_hostname' + end end def self.down diff --git a/db/schema.rb b/db/schema.rb index 73a1454..7bae5fd 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 => 20130124175109) do +ActiveRecord::Schema.define(:version => 20130128121800) do create_table "access_authorizations", :force => true do |t| t.string "access_authorizationable_type" @@ -876,6 +876,50 @@ ActiveRecord::Schema.define(:version => 20130124175109) do t.datetime "updated_at", :null => false end + create_table "sip_registrations", :id => false, :force => true do |t| + t.string "call_id" + t.string "sip_user" + t.string "sip_host" + t.string "presence_hosts" + t.string "contact", :limit => 1024 + t.string "status" + t.string "rpid" + t.integer "expires" + t.string "user_agent" + t.string "server_user" + t.string "server_host" + t.string "profile_name" + t.string "hostname" + t.string "network_ip" + t.string "network_port", :limit => 6 + t.string "sip_username" + t.string "sip_realm" + t.string "mwi_user" + t.string "mwi_host" + t.string "orig_server_host" + t.string "orig_hostname" + t.string "sub_host" + end + + add_index "sip_registrations", ["call_id"], :name => "sr_call_id" + add_index "sip_registrations", ["contact"], :name => "sr_contact" + add_index "sip_registrations", ["expires"], :name => "sr_expires" + add_index "sip_registrations", ["hostname"], :name => "sr_hostname" + add_index "sip_registrations", ["mwi_host"], :name => "sr_mwi_host" + add_index "sip_registrations", ["mwi_user"], :name => "sr_mwi_user" + add_index "sip_registrations", ["network_ip"], :name => "sr_network_ip" + add_index "sip_registrations", ["network_port"], :name => "sr_network_port" + add_index "sip_registrations", ["orig_hostname"], :name => "sr_orig_hostname" + add_index "sip_registrations", ["orig_server_host"], :name => "sr_orig_server_host" + add_index "sip_registrations", ["presence_hosts"], :name => "sr_presence_hosts" + add_index "sip_registrations", ["profile_name"], :name => "sr_profile_name" + add_index "sip_registrations", ["sip_host"], :name => "sr_sip_host" + add_index "sip_registrations", ["sip_realm"], :name => "sr_sip_realm" + add_index "sip_registrations", ["sip_user"], :name => "sr_sip_user" + add_index "sip_registrations", ["sip_username"], :name => "sr_sip_username" + add_index "sip_registrations", ["status"], :name => "sr_status" + add_index "sip_registrations", ["sub_host"], :name => "sr_sub_host" + create_table "softkey_functions", :force => true do |t| t.string "name" t.datetime "created_at", :null => false |