From 67379f70406ef1a58a839953e87ae6fda8606032 Mon Sep 17 00:00:00 2001 From: Martin Edenhofer Date: Tue, 11 Jun 2013 23:24:04 +0200 Subject: [PATCH] Moved footer to java script context. Added boot splash screen. --- .../content_permanent_widget.js.coffee | 7 ------- .../javascripts/app/controllers/footer.js.coffee | 15 +++++++++++++++ .../app/lib/app_post/interface_handle.js.coffee | 3 +++ .../app/lib/app_post/task_manager.js.coffee | 4 ++++ app/assets/javascripts/app/views/footer.jst.eco | 4 ++++ app/assets/stylesheets/zzz.css | 16 +++++++++++++++- app/views/init/index.html.erb | 13 ++----------- db/seeds.rb | 2 +- 8 files changed, 44 insertions(+), 20 deletions(-) delete mode 100644 app/assets/javascripts/app/controllers/content_permanent_widget.js.coffee create mode 100644 app/assets/javascripts/app/controllers/footer.js.coffee create mode 100644 app/assets/javascripts/app/views/footer.jst.eco diff --git a/app/assets/javascripts/app/controllers/content_permanent_widget.js.coffee b/app/assets/javascripts/app/controllers/content_permanent_widget.js.coffee deleted file mode 100644 index d7c30f0fe..000000000 --- a/app/assets/javascripts/app/controllers/content_permanent_widget.js.coffee +++ /dev/null @@ -1,7 +0,0 @@ -class App.ContentPermanentWidget extends App.ControllerPermanent - className: 'container aaa' - - constructor: -> - super - -App.Config.set( 'content_permanent', App.ContentPermanentWidget, 'Widgets' ) diff --git a/app/assets/javascripts/app/controllers/footer.js.coffee b/app/assets/javascripts/app/controllers/footer.js.coffee new file mode 100644 index 000000000..c0e146899 --- /dev/null +++ b/app/assets/javascripts/app/controllers/footer.js.coffee @@ -0,0 +1,15 @@ +class App.Footer extends App.Controller + className: 'container' + + constructor: -> + super + @render() + + # rebuild ticket overview data + App.Event.bind 'ui:rerender', => + @render() + + render: () -> + @html App.view('footer')() + +App.Config.set( 'zzzfooter', App.Footer, 'Widgets' ) diff --git a/app/assets/javascripts/app/lib/app_post/interface_handle.js.coffee b/app/assets/javascripts/app/lib/app_post/interface_handle.js.coffee index c776a04f7..1cfa88692 100644 --- a/app/assets/javascripts/app/lib/app_post/interface_handle.js.coffee +++ b/app/assets/javascripts/app/lib/app_post/interface_handle.js.coffee @@ -9,6 +9,9 @@ class App.Run extends App.Controller if !App.Browser.check() return + # hide splash screen + $('#splash').hide() + # init collections App.Collection.init() diff --git a/app/assets/javascripts/app/lib/app_post/task_manager.js.coffee b/app/assets/javascripts/app/lib/app_post/task_manager.js.coffee index 9d0f53ada..68f3744e7 100644 --- a/app/assets/javascripts/app/lib/app_post/task_manager.js.coffee +++ b/app/assets/javascripts/app/lib/app_post/task_manager.js.coffee @@ -105,6 +105,10 @@ class _Singleton extends App.Controller tasks = @all() + # create div for permanent content + if !$("#content_permanent")[0] + $('#app').append('
') + # empty static content if task is shown if active @activeTask = key diff --git a/app/assets/javascripts/app/views/footer.jst.eco b/app/assets/javascripts/app/views/footer.jst.eco new file mode 100644 index 000000000..dc72ac441 --- /dev/null +++ b/app/assets/javascripts/app/views/footer.jst.eco @@ -0,0 +1,4 @@ + diff --git a/app/assets/stylesheets/zzz.css b/app/assets/stylesheets/zzz.css index cd465171a..c0501e234 100644 --- a/app/assets/stylesheets/zzz.css +++ b/app/assets/stylesheets/zzz.css @@ -449,4 +449,18 @@ footer { } .sub_attribute .controls { margin-left: 80px; -} \ No newline at end of file +} + +#splash { + background-color: #eee; + position: absolute; + width: 100%; + top: 0px; + height: 100%; +} +#splash .logo { + margin-left: auto; + margin-right: auto; + margin-top: 200px; + width: 100px; +} diff --git a/app/views/init/index.html.erb b/app/views/init/index.html.erb index fe131c0e7..113f0a8de 100644 --- a/app/views/init/index.html.erb +++ b/app/views/init/index.html.erb @@ -1,16 +1,7 @@ -
- -
- -
- +
\ No newline at end of file + diff --git a/db/seeds.rb b/db/seeds.rb index 379a8aa5a..b4e4afaf3 100644 --- a/db/seeds.rb +++ b/db/seeds.rb @@ -1807,7 +1807,7 @@ Translation.create_if_not_exists( :locale => 'de', :source => "First Response Ti Translation.create_if_not_exists( :locale => 'de', :source => "Update Time", :target => "Aktuallisierungszeit" ) Translation.create_if_not_exists( :locale => 'de', :source => "Solution Time", :target => "Lösungszeit" ) Translation.create_if_not_exists( :locale => 'de', :source => "Add Attribute", :target => "Attribut hinzufügen" ) -Translation.create_if_not_exists( :locale => 'de', :source => "", :target => "" ) +Translation.create_if_not_exists( :locale => 'de', :source => "Back to top", :target => "Nach oben" ) #Translation.create_if_not_exists( :locale => 'de', :source => "", :target => "" )