Merge branch 'develop' of github.com:amooma/GS5 into develop

Conflicts:
	misc/freeswitch/scripts/dialplan/router.lua

15 files changed, 156 insertions, 15 deletions

diff --git a/app/views/call_routes/_form.html.haml b/app/views/call_routes/_form.html.haml
new file mode 100644
index 0000000..1415852
--- /dev/null
+++ b/app/views/call_routes/_form.html.haml
@@ -0,0 +1,7 @@
+= simple_form_for(@call_route) do |f|
+  = f.error_notification
+
+  = render "form_core", :f => f
+
+  .actions
+    = f.button :submit, conditional_t('call_routes.form.submit')
\ No newline at end of file
diff --git a/app/views/call_routes/_form_core.html.haml b/app/views/call_routes/_form_core.html.haml
new file mode 100644
index 0000000..4b97434
--- /dev/null
+++ b/app/views/call_routes/_form_core.html.haml
@@ -0,0 +1,6 @@
+.inputs
+  = f.input :table, :label => t('call_routes.form.table.label'), :hint => conditional_hint('call_routes.form.table.hint')
+  = f.input :name, :label => t('call_routes.form.name.label'), :hint => conditional_hint('call_routes.form.name.hint')
+  = f.input :endpoint_type, :label => t('call_routes.form.endpoint_type.label'), :hint => conditional_hint('call_routes.form.endpoint_type.hint')
+  = f.input :endpoint_id, :label => t('call_routes.form.endpoint_id.label'), :hint => conditional_hint('call_routes.form.endpoint_id.hint')
+  = f.input :position, :label => t('call_routes.form.position.label'), :hint => conditional_hint('call_routes.form.position.hint')
diff --git a/app/views/call_routes/_index_core.html.haml b/app/views/call_routes/_index_core.html.haml
new file mode 100644
index 0000000..6ea3af7
--- /dev/null
+++ b/app/views/call_routes/_index_core.html.haml
@@ -0,0 +1,17 @@
+%table
+  %tr
+    %th= t('call_routes.index.table')
+    %th= t('call_routes.index.name')
+    %th= t('call_routes.index.endpoint_type')
+    %th= t('call_routes.index.endpoint_id')
+    %th= t('call_routes.index.position')
+
+  - reset_cycle
+  - for call_route in call_routes
+    %tr{:class => cycle('odd', 'even')}
+      %td= call_route.table
+      %td= call_route.name
+      %td= call_route.endpoint_type
+      %td= call_route.endpoint_id
+      %td= call_route.position
+      =render :partial => 'shared/index_view_edit_destroy_part', :locals => {:child => call_route}
\ No newline at end of file
diff --git a/app/views/call_routes/edit.html.haml b/app/views/call_routes/edit.html.haml
new file mode 100644
index 0000000..0ad46c5
--- /dev/null
+++ b/app/views/call_routes/edit.html.haml
@@ -0,0 +1,3 @@
+- title t("call_routes.edit.page_title")
+
+= render "form"
\ No newline at end of file
diff --git a/app/views/call_routes/index.html.haml b/app/views/call_routes/index.html.haml
new file mode 100644
index 0000000..687a9dc
--- /dev/null
+++ b/app/views/call_routes/index.html.haml
@@ -0,0 +1,6 @@
+- title t("call_routes.index.page_title")
+
+- if @call_routes && @call_routes.count > 0
+  = render "index_core", :call_routes => @call_routes
+
+= render :partial => 'shared/create_link', :locals => {:child_class => CallRoute}
\ No newline at end of file
diff --git a/app/views/call_routes/new.html.haml b/app/views/call_routes/new.html.haml
new file mode 100644
index 0000000..0796d7f
--- /dev/null
+++ b/app/views/call_routes/new.html.haml
@@ -0,0 +1,3 @@
+- title t("call_routes.new.page_title")
+
+= render "form"
\ No newline at end of file
diff --git a/app/views/call_routes/show.html.haml b/app/views/call_routes/show.html.haml
new file mode 100644
index 0000000..31c3cb0
--- /dev/null
+++ b/app/views/call_routes/show.html.haml
@@ -0,0 +1,19 @@
+- title t("call_routes.show.page_title")
+
+%p
+  %strong= t('call_routes.show.table') + ":"
+  = @call_route.table
+%p
+  %strong= t('call_routes.show.name') + ":"
+  = @call_route.name
+%p
+  %strong= t('call_routes.show.endpoint_type') + ":"
+  = @call_route.endpoint_type
+%p
+  %strong= t('call_routes.show.endpoint_id') + ":"
+  = @call_route.endpoint_id
+%p
+  %strong= t('call_routes.show.position') + ":"
+  = @call_route.position
+
+= render :partial => 'shared/show_edit_destroy_part', :locals => { :child => @call_route }
\ No newline at end of file
diff --git a/app/views/layouts/application.html.haml b/app/views/layouts/application.html.haml
index c1a56f2..a2afbf8 100644
--- a/app/views/layouts/application.html.haml
+++ b/app/views/layouts/application.html.haml
@@ -3,8 +3,7 @@
 <!--[if IE 7]>    <html lang="en" class="no-js ie7"> <![endif]-->
 <!--[if IE 8]>    <html lang="en" class="no-js ie8"> <![endif]-->
 <!--[if gt IE 8]><!-->
-%html.no-js{ :lang => "en" }
-  ~#OPTIMIZE Make html lang attribute reflect the actual language.
+%html.no-js{ :lang => I18n.locale.to_s }
   <!--<![endif]-->
   %header
     %meta{ :charset => "utf-8" }/
@@ -19,7 +18,8 @@
 
   %body
     #container
-      = render :partial => "shared/header"
+      - cache(['application_header', I18n.locale, current_user]) do
+        = render :partial => "shared/header"
       = render :partial => "shared/flash", :locals => { :flash => flash}
 
       #content{:role => 'main'}
@@ -30,18 +30,19 @@
               %h1= yield(:title)
           = yield
 
-      %footer#main
-        %ul
-          %li
-            %a{:href => "http://amooma.de/gemeinschaft/gs5"} Gemeinschaft #{GsParameter.get('GEMEINSCHAFT_VERSION')}
-          - if GuiFunction.display?('amooma_commercial_support_link_in_footer', current_user)
+      - cache(['application_footer', I18n.locale]) do
+        %footer#main
+          %ul
             %li
-              %a{:href => "http://amooma.de"} Kommerzieller Support und Consulting
-          - if GuiFunction.display?('gemeinschaft_mailinglist_link_in_footer', current_user)
-            %li
-              %a{:href => "https://groups.google.com/group/gs5-users/"} Kostenlose Mailingliste
+              %a{:href => "http://amooma.de/gemeinschaft/gs5"} Gemeinschaft #{GsParameter.get('GEMEINSCHAFT_VERSION')}
+            - if GuiFunction.display?('amooma_commercial_support_link_in_footer', current_user)
+              %li
+                %a{:href => "http://amooma.de"} Kommerzieller Support und Consulting
+            - if GuiFunction.display?('gemeinschaft_mailinglist_link_in_footer', current_user)
+              %li
+                %a{:href => "https://groups.google.com/group/gs5-users/"} Kostenlose Mailingliste
 
-        .amooma-logo
-          %span brought to you by
-          %a{ :target => '_blank', :href => "http://amooma.de/" } Amooma
+          .amooma-logo
+            %span brought to you by
+            %a{ :target => '_blank', :href => "http://amooma.de/" } Amooma
 
diff --git a/app/views/route_elements/_form.html.haml b/app/views/route_elements/_form.html.haml
new file mode 100644
index 0000000..cfa4c6b
--- /dev/null
+++ b/app/views/route_elements/_form.html.haml
@@ -0,0 +1,7 @@
+= simple_form_for(@route_element) do |f|
+  = f.error_notification
+
+  = render "form_core", :f => f
+
+  .actions
+    = f.button :submit, conditional_t('route_elements.form.submit')
\ No newline at end of file
diff --git a/app/views/route_elements/_form_core.html.haml b/app/views/route_elements/_form_core.html.haml
new file mode 100644
index 0000000..7697cb0
--- /dev/null
+++ b/app/views/route_elements/_form_core.html.haml
@@ -0,0 +1,9 @@
+.inputs
+  = f.input :call_route_id, :label => t('route_elements.form.call_route_id.label'), :hint => conditional_hint('route_elements.form.call_route_id.hint')
+  = f.input :var_in, :label => t('route_elements.form.var_in.label'), :hint => conditional_hint('route_elements.form.var_in.hint')
+  = f.input :var_out, :label => t('route_elements.form.var_out.label'), :hint => conditional_hint('route_elements.form.var_out.hint')
+  = f.input :pattern, :label => t('route_elements.form.pattern.label'), :hint => conditional_hint('route_elements.form.pattern.hint')
+  = f.input :replacement, :label => t('route_elements.form.replacement.label'), :hint => conditional_hint('route_elements.form.replacement.hint')
+  = f.input :action, :label => t('route_elements.form.action.label'), :hint => conditional_hint('route_elements.form.action.hint')
+  = f.input :mandatory, :label => t('route_elements.form.mandatory.label'), :hint => conditional_hint('route_elements.form.mandatory.hint')
+  = f.input :position, :label => t('route_elements.form.position.label'), :hint => conditional_hint('route_elements.form.position.hint')
diff --git a/app/views/route_elements/_index_core.html.haml b/app/views/route_elements/_index_core.html.haml
new file mode 100644
index 0000000..63665fd
--- /dev/null
+++ b/app/views/route_elements/_index_core.html.haml
@@ -0,0 +1,23 @@
+%table
+  %tr
+    %th= t('route_elements.index.call_route_id')
+    %th= t('route_elements.index.var_in')
+    %th= 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= t('route_elements.index.position')
+
+  - reset_cycle
+  - for route_element in route_elements
+    %tr{:class => cycle('odd', 'even')}
+      %td= route_element.call_route_id
+      %td= route_element.var_in
+      %td= route_element.var_out
+      %td= route_element.pattern
+      %td= route_element.replacement
+      %td= route_element.action
+      %td= route_element.mandatory
+      %td= route_element.position
+      =render :partial => 'shared/index_view_edit_destroy_part', :locals => {:child => route_element}
\ No newline at end of file
diff --git a/app/views/route_elements/edit.html.haml b/app/views/route_elements/edit.html.haml
new file mode 100644
index 0000000..770eb6c
--- /dev/null
+++ b/app/views/route_elements/edit.html.haml
@@ -0,0 +1,3 @@
+- title t("route_elements.edit.page_title")
+
+= render "form"
\ No newline at end of file
diff --git a/app/views/route_elements/index.html.haml b/app/views/route_elements/index.html.haml
new file mode 100644
index 0000000..b05236b
--- /dev/null
+++ b/app/views/route_elements/index.html.haml
@@ -0,0 +1,6 @@
+- title t("route_elements.index.page_title")
+
+- if @route_elements && @route_elements.count > 0
+  = render "index_core", :route_elements => @route_elements
+
+= render :partial => 'shared/create_link', :locals => {:child_class => RouteElement}
\ No newline at end of file
diff --git a/app/views/route_elements/new.html.haml b/app/views/route_elements/new.html.haml
new file mode 100644
index 0000000..903e808
--- /dev/null
+++ b/app/views/route_elements/new.html.haml
@@ -0,0 +1,3 @@
+- title t("route_elements.new.page_title")
+
+= render "form"
\ No newline at end of file
diff --git a/app/views/route_elements/show.html.haml b/app/views/route_elements/show.html.haml
new file mode 100644
index 0000000..a439353
--- /dev/null
+++ b/app/views/route_elements/show.html.haml
@@ -0,0 +1,28 @@
+- title t("route_elements.show.page_title")
+
+%p
+  %strong= t('route_elements.show.call_route_id') + ":"
+  = @route_element.call_route_id
+%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
+%p
+  %strong= t('route_elements.show.position') + ":"
+  = @route_element.position
+
+= render :partial => 'shared/show_edit_destroy_part', :locals => { :child => @route_element }
\ No newline at end of file