Rewrite prepareSiteLinks and add check for "-"

Don't show a link which is disable ("-" as content) and rewrite
prepareSiteLinks (do one task two times in exactly the same way).

Change-Id: I8123dc9234cf884ea70d791db221639fcf94eb94