making things work

This commit is contained in:
nek0 2016-09-09 21:38:11 +02:00
parent 8e13532ba1
commit ad95f1dc6f
8 changed files with 22 additions and 12 deletions

View File

@ -69,6 +69,7 @@ import Handler.AdminComments
import Handler.Tag import Handler.Tag
import Handler.RootFeed import Handler.RootFeed
-- import Handler.Search -- import Handler.Search
import Handler.About
-- This line actually creates our YesodDispatch instance. It is the second half -- This line actually creates our YesodDispatch instance. It is the second half
-- of the call to mkYesodData which occurs in Foundation.hs. Please see the -- of the call to mkYesodData which occurs in Foundation.hs. Please see the

View File

@ -14,10 +14,13 @@
-- You should have received a copy of the GNU Affero General Public License -- You should have received a copy of the GNU Affero General Public License
-- along with this program. If not, see <http://www.gnu.org/licenses/>. -- along with this program. If not, see <http://www.gnu.org/licenses/>.
module Handler.About where
import Import import Import
getAboutR :: Handler Html getAboutR :: Handler Html
getAboutR = getAboutR = do
master <- getYesod
defaultLayout $ defaultLayout $
$(widgetFile "about") $(widgetFile "about")

View File

@ -51,5 +51,8 @@ infixr 5 <>
(<>) = mappend (<>) = mappend
#endif #endif
version :: Text import Data.Version
version = "" import qualified Paths_eidolon as P
version :: String
version = showVersion $ P.version

View File

@ -97,14 +97,14 @@ instance FromJSON AppSettings where
appMutableStatic <- o .:? "mutable-static" .!= defaultDev appMutableStatic <- o .:? "mutable-static" .!= defaultDev
appSkipCombining <- o .:? "skip-combining" .!= defaultDev appSkipCombining <- o .:? "skip-combining" .!= defaultDev
appAfferoLink <- o .: "copyrightLink" appAfferoLink <- o .: "afferoLink"
appAnalytics <- o .:? "analytics" appAnalytics <- o .:? "analytics"
appSignupBlocked <- o .: "signupBlocked" appSignupBlocked <- o .: "signupBlocked"
appTos1 <- o .: "tos1" appTos1 <- o .: "tos1"
appTos2 <- o .: "tos2" appTos2 <- o .: "tos2"
appContact <- o .:? "contactEmail" appContactEmail <- o .:? "contactEmail"
return AppSettings {..} return AppSettings {..}

View File

@ -20,6 +20,7 @@ Flag library-only
Default: False Default: False
library library
other-modules: Paths_eidolon
exposed-modules: Application exposed-modules: Application
Foundation Foundation
Helper Helper
@ -51,6 +52,7 @@ library
Handler.RootFeed Handler.RootFeed
Handler.Commons Handler.Commons
-- Handler.Search -- Handler.Search
Handler.About
if flag(dev) || flag(library-only) if flag(dev) || flag(library-only)
cpp-options: -DDEVELOPMENT cpp-options: -DDEVELOPMENT

View File

@ -193,6 +193,10 @@ footer {
float: right; float: right;
} }
ul, ol {
text-align: left;
}
@media (max-width: 755px) { @media (max-width: 755px) {
#main { #main {
margin-top: 120px; margin-top: 120px;

View File

@ -7,17 +7,14 @@ $newline always
This software is licenced under the This software is licenced under the
<a href="http://www.gnu.org/licenses/agpl-3.0"> <a href="http://www.gnu.org/licenses/agpl-3.0">
GNU Affero General Public License 3.0 GNU Affero General Public License 3.0
.
<p> <p>
The source code for this instance canbe found at The source code for this instance can be found at
<a href="#{appAfferoLink $ appSettings master} target=_blank> <a href="#{appAfferoLink $ appSettings master}" target=_blank>
#{appAfferoLink $ appSettings master} #{appAfferoLink $ appSettings master}
.
$maybe contact <- appContactEmail $ appSettings master $maybe contact <- appContactEmail $ appSettings master
<p> <p>
if you wish to contact the maintaner of this Eidolon, you can do it by if you wish to contact the maintaner of this Eidolon, you can do it by
<a href="mailto:#{appContactEmail $ appSettings master}"> <a href="mailto:#{contact}">
email email
.
<a href=@{ThreatR}> <a href=@{ThreatR}>
Data and threat analysis Data and threat analysis

View File

@ -35,5 +35,5 @@ $newline always
anonymous email account. anonymous email account.
<p> <p>
Passwords are stored salted and hashed in the database rendering them Passwords are stored salted and hashed in the database rendering them
useless to an attacker. Additionally the authentication mechanism does not useless to an attacker.<br>Additionally the authentication mechanism does not
need the password to be transmitted in clear text to the server. need the password to be transmitted in clear text to the server.