Browse Source

Added title as configuration option.

pull/1/head
Simon Eisenmann 12 years ago
parent
commit
18d324f390
  1. 2
      html/head.html
  2. 2
      html/logo.html
  3. 1
      server.conf.in
  4. 5
      src/app/spreed-speakfreely-server/config.go
  5. 11
      src/app/spreed-speakfreely-server/main.go

2
html/head.html

@ -1,4 +1,4 @@ @@ -1,4 +1,4 @@
<%define "head"%><title>Spreed Speak Freely</title>
<%define "head"%><title><%.Cfg.Title%></title>
<meta name="viewport" content="width=device-width,initial-scale=1,maximum-scale=1,user-scalable=no">
<meta name="apple-mobile-web-app-capable" content="yes">
<meta name="mobile-web-app-capable" content="yes">

2
html/logo.html

@ -1 +1 @@ @@ -1 +1 @@
<%define "logo"%><span class="logo" title="Spreed Speak Freely"><span><a target="_blank" href="https://github.com/strukturag/spreed-speakfreely">Speak Freely</a></span><%end%>
<%define "logo"%><span class="logo" title="<%.Cfg.Title%>"><span><a target="_blank" href="https://github.com/strukturag/spreed-speakfreely">Speak Freely</a></span><%end%>

1
server.conf.in

@ -7,6 +7,7 @@ listen = 127.0.0.1:8080 @@ -7,6 +7,7 @@ listen = 127.0.0.1:8080
#writetimeout = 10
[app]
#title = Spreed Speak Freely
#ver = 1234 # version string to use for static resource
#stunURIs = stun.l.google.com:19302
#turnURIs = turn:turnserver:port?transport=udp turn:anotherturnserver:port?transport=tcp turns:turnserver:443?transport=tcp

5
src/app/spreed-speakfreely-server/config.go

@ -25,6 +25,7 @@ import ( @@ -25,6 +25,7 @@ import (
)
type Config struct {
Title string // Title
ver string // Version (not exported to Javascript)
S string // Static URL prefix with version
StunURIs []string // STUN server URIs
@ -34,7 +35,7 @@ type Config struct { @@ -34,7 +35,7 @@ type Config struct {
globalRoomid string // Id of the global room (not exported to Javascript)
}
func NewConfig(ver, runtimeVersion string, stunURIs, turnURIs []string, tokens bool, globalRoomid string) *Config {
func NewConfig(title, ver, runtimeVersion string, stunURIs, turnURIs []string, tokens bool, globalRoomid string) *Config {
sv := fmt.Sprintf("static/ver=%s", ver)
return &Config{ver: ver, S: sv, StunURIs: stunURIs, TurnURIs: turnURIs, Tokens: tokens, Version: runtimeVersion, globalRoomid: globalRoomid}
return &Config{Title: title, ver: ver, S: sv, StunURIs: stunURIs, TurnURIs: turnURIs, Tokens: tokens, Version: runtimeVersion, globalRoomid: globalRoomid}
}

11
src/app/spreed-speakfreely-server/main.go

@ -155,6 +155,11 @@ func runner(runtime phoenix.Runtime) error { @@ -155,6 +155,11 @@ func runner(runtime phoenix.Runtime) error {
}
}
title, err := runtime.GetString("app", "title")
if err != nil {
title = "Spreed Speak Freely"
}
ver, err := runtime.GetString("app", "ver")
if err != nil {
ver = ""
@ -208,7 +213,7 @@ func runner(runtime phoenix.Runtime) error { @@ -208,7 +213,7 @@ func runner(runtime phoenix.Runtime) error {
}
// Create configuration data structure.
config = NewConfig(ver, runtimeVersion, stunURIs, turnURIs, tokenProvider != nil, globalRoomid)
config = NewConfig(title, ver, runtimeVersion, stunURIs, turnURIs, tokenProvider != nil, globalRoomid)
// Load templates.
tt := template.New("")
@ -221,7 +226,7 @@ func runner(runtime phoenix.Runtime) error { @@ -221,7 +226,7 @@ func runner(runtime phoenix.Runtime) error {
// Load extra templates folder
extraFolder, err := runtime.GetString("app", "extra")
if err == nil {
if err == nil {
if !httputils.HasDirPath(extraFolder) {
return fmt.Errorf("Configured extra '%s' is not a directory.", extraFolder)
}
@ -229,7 +234,7 @@ func runner(runtime phoenix.Runtime) error { @@ -229,7 +234,7 @@ func runner(runtime phoenix.Runtime) error {
if err != nil {
return fmt.Errorf("Failed to load extra templates: %s", err)
} else {
log.Printf("Loaded extra templates from: %s", extraFolder);
log.Printf("Loaded extra templates from: %s", extraFolder)
}
}

Loading…
Cancel
Save