Merge branch 'emberjs' into develop

3 files changed, 40 insertions, 3 deletions

diff --git a/config/locales/views/switchboards/de.yml b/config/locales/views/switchboards/de.yml
index 97a47b8..e73b100 100644
--- a/config/locales/views/switchboards/de.yml
+++ b/config/locales/views/switchboards/de.yml
@@ -9,6 +9,9 @@ de:
       page_title: 'Switchboards'
       name: 'Name'
       user_id: 'User'
+      reload_interval:: 'Reload Interval'
+      show_avatars: 'Show avatars'
+      entry_width: 'Entry width'
       actions:
         confirm_destroy: 'Sind Sie sicher, dass Sie folgendes löschen möchten: Switchboard'
         destroy: 'Löschen'
@@ -20,6 +23,9 @@ de:
       page_title: 'Switchboard bearbeiten'
       name: 'Name'
       user_id: 'User'
+      reload_interval:: 'Reload Interval'
+      show_avatars: 'Show avatars'
+      entry_width: 'Entry width'
       actions:
         confirm_destroy: 'Sind Sie sicher, dass die dieses Element löschen möchten?'
         destroy: 'Löschen'
@@ -42,4 +48,13 @@ de:
       user_id:
         label: 'User'
         hint: ''
+      reload_interval:
+        label: 'Reload Interval'
+        hint: 'Milliseconds. nil = no reload'
+      show_avatars:
+        label: 'Show avatars'
+        hint: ''
+      entry_width:
+        label: 'Entry width'
+        hint: ''
       submit: 'Absenden'
\ No newline at end of file
diff --git a/config/locales/views/switchboards/en.yml b/config/locales/views/switchboards/en.yml
index a860763..8489d28 100644
--- a/config/locales/views/switchboards/en.yml
+++ b/config/locales/views/switchboards/en.yml
@@ -9,6 +9,9 @@ en:
       page_title: 'Switchboards'
       name: 'Name'
       user_id: 'User'
+      reload_interval:: 'Reload Interval'
+      show_avatars: 'Show avatars'
+      entry_width: 'Entry width'
       actions:
         confirm_destroy: 'Are you sure you want to delete this Switchboard?'
         destroy: 'Delete'
@@ -20,6 +23,9 @@ en:
       page_title: 'Show Switchboard'
       name: 'Name'
       user_id: 'User'
+      reload_interval:: 'Reload Interval'
+      show_avatars: 'Show avatars'
+      entry_width: 'Entry width'      
       actions:
         confirm_destroy: 'Are you sure you want to delete this element?'
         destroy: 'Delete'
@@ -42,4 +48,13 @@ en:
       user_id:
         label: 'User'
         hint: ''
+      reload_interval:
+        label: 'Reload Interval'
+        hint: 'Milliseconds. nil = no reload'
+      show_avatars:
+        label: 'Show avatars'
+        hint: ''
+      entry_width:
+        label: 'Entry width'
+        hint: ''
       submit: 'Submit'
\ No newline at end of file
diff --git a/config/routes.rb b/config/routes.rb
index 3f0aae4..1fb9d7a 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -1,4 +1,14 @@
 Gemeinschaft42c::Application.routes.draw do
+  namespace :api, defaults: {format: 'json'} do
+    namespace :v1 do
+      resources :switchboards, :only => [:show, :index]
+      resources :switchboard_entries, :only => [:show, :index]
+      resources :sip_accounts, :only => [:show, :index]
+      resources :phone_numbers, :only => [:show, :index]
+    end
+
+    resources :rows 
+  end
 
   resources :voicemail_accounts do
     resources :voicemail_settings
@@ -62,9 +72,6 @@ Gemeinschaft42c::Application.routes.draw do
 
   resources :gui_functions
 
-  namespace :api do 
-    resources :rows 
-  end
 
   resources :phone_numbers, :only => [:sort] do
     collection { post :sort }