Moved footer to java script context. Added boot splash screen.
This commit is contained in:
parent
64230737da
commit
67379f7040
8 changed files with 44 additions and 20 deletions
|
@ -1,7 +0,0 @@
|
||||||
class App.ContentPermanentWidget extends App.ControllerPermanent
|
|
||||||
className: 'container aaa'
|
|
||||||
|
|
||||||
constructor: ->
|
|
||||||
super
|
|
||||||
|
|
||||||
App.Config.set( 'content_permanent', App.ContentPermanentWidget, 'Widgets' )
|
|
15
app/assets/javascripts/app/controllers/footer.js.coffee
Normal file
15
app/assets/javascripts/app/controllers/footer.js.coffee
Normal file
|
@ -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' )
|
|
@ -9,6 +9,9 @@ class App.Run extends App.Controller
|
||||||
if !App.Browser.check()
|
if !App.Browser.check()
|
||||||
return
|
return
|
||||||
|
|
||||||
|
# hide splash screen
|
||||||
|
$('#splash').hide()
|
||||||
|
|
||||||
# init collections
|
# init collections
|
||||||
App.Collection.init()
|
App.Collection.init()
|
||||||
|
|
||||||
|
|
|
@ -105,6 +105,10 @@ class _Singleton extends App.Controller
|
||||||
|
|
||||||
tasks = @all()
|
tasks = @all()
|
||||||
|
|
||||||
|
# create div for permanent content
|
||||||
|
if !$("#content_permanent")[0]
|
||||||
|
$('#app').append('<div id="content_permanent" class="container"></div>')
|
||||||
|
|
||||||
# empty static content if task is shown
|
# empty static content if task is shown
|
||||||
if active
|
if active
|
||||||
@activeTask = key
|
@activeTask = key
|
||||||
|
|
4
app/assets/javascripts/app/views/footer.jst.eco
Normal file
4
app/assets/javascripts/app/views/footer.jst.eco
Normal file
|
@ -0,0 +1,4 @@
|
||||||
|
<footer class="footer">
|
||||||
|
<p class="pull-right"><a href="javascript:window.scrollTo(0,0);"><%- @T('Back to top') %></a></p>
|
||||||
|
<p><%- @T('Designed and built with all the love in the world') %> <a href="http://twitter.com/zammad_org">@zammad_org</a></p>
|
||||||
|
</footer>
|
|
@ -450,3 +450,17 @@ footer {
|
||||||
.sub_attribute .controls {
|
.sub_attribute .controls {
|
||||||
margin-left: 80px;
|
margin-left: 80px;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#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;
|
||||||
|
}
|
||||||
|
|
|
@ -1,14 +1,5 @@
|
||||||
|
|
||||||
<div id="app"></div>
|
<div id="app"></div>
|
||||||
|
<div id="splash"><div class="logo">booting...</div></div>
|
||||||
<div class="container">
|
|
||||||
<footer class="footer">
|
|
||||||
<!-- <p class="pull-right">Powered by <a href="" target="_blank">xxx</a></p>-->
|
|
||||||
<p class="pull-right"><a href="javascript:window.scrollTo(0,0);">Back to top</a></p>
|
|
||||||
<p>Designed and built with all the love in the world <a href="http://twitter.com/zammad_org">@zammad_org</a></p>
|
|
||||||
</footer>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<script type="text/javascript">
|
<script type="text/javascript">
|
||||||
jQuery(function(){
|
jQuery(function(){
|
||||||
new App.Run();
|
new App.Run();
|
||||||
|
|
|
@ -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 => "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 => "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 => "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 => "" )
|
#Translation.create_if_not_exists( :locale => 'de', :source => "", :target => "" )
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue