Mercurial > irccd

changeset 39:b3e0050463bf

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Docs: remove irccd-web related stuff
author David Demelier <markand@malikania.fr>
date Tue, 23 Feb 2016 15:38:00 +0100
parents c619a2932730
children 909eb532ca9a
files cmake/IrccdOptions.cmake cmake/function/IrccdDefineHtml.cmake doc/html/resources/CMakeLists.txt doc/html/resources/css/irccd.css doc/html/resources/template.html plugins/CMakeLists.txt
diffstat 6 files changed, 5 insertions(+), 139 deletions(-) [+]
line wrap: on
line diff
--- a/cmake/IrccdOptions.cmake	Tue Feb 23 13:26:16 2016 +0100
+++ b/cmake/IrccdOptions.cmake	Tue Feb 23 15:38:00 2016 +0100
@@ -54,12 +54,6 @@
 # WITH_TEST_IRCPORT	Which IRC server port to use for tests (default: 6667)
 #
 
-#
-# Options for developers:
-#
-# WITH_WEB		Set to true to use the HTML template for official irccd website.
-#
-
 # Manual pages on Windows are pretty useless.
 if (WIN32)
 	set(DEFAULT_MAN "No")
@@ -98,8 +92,6 @@
 set(WITH_TEST_IRCHOST "127.0.0.1" CACHE STRING "IRC host for tests")
 set(WITH_TEST_IRCPORT 6667 CACHE STRING "IRC port for test")
 
-option(WITH_WEB "Use HTML template for official website" Off)
-
 # ---------------------------------------------------------
 # Installation paths
 # ---------------------------------------------------------
--- a/cmake/function/IrccdDefineHtml.cmake	Tue Feb 23 13:26:16 2016 +0100
+++ b/cmake/function/IrccdDefineHtml.cmake	Tue Feb 23 15:38:00 2016 +0100
@@ -63,10 +63,6 @@
 		set(base ${CMAKE_BINARY_DIR}/docs)
 	endif ()
 
-	if (WITH_WEB)
-		set(ARGS web:1)
-	endif ()
-
 	if (HTML_OUTPUT)
 		#
 		# First signature.
@@ -98,7 +94,7 @@
 				${resources_SOURCE_DIR}/template.html
 				docs-resources
 			ARGS ${HTML_ARGS}
-			VARIABLE baseurl:${baseurl} doc:1 ${ARGS}
+			VARIABLE baseurl:${baseurl}
 			FROM markdown TO html5
 			STANTALONE MAKE_DIRECTORY
 		)
@@ -132,7 +128,7 @@
 					${resources_SOURCE_DIR}/template.html
 					docs-resources
 				ARGS ${HTML_ARGS}
-				VARIABLE baseurl:${baseurl} standalone:1 doc:1 ${ARGS}
+				VARIABLE baseurl:${baseurl}
 				FROM markdown TO html5
 				STANTALONE MAKE_DIRECTORY
 			)
--- a/doc/html/resources/CMakeLists.txt	Tue Feb 23 13:26:16 2016 +0100
+++ b/doc/html/resources/CMakeLists.txt	Tue Feb 23 15:38:00 2016 +0100
@@ -28,7 +28,6 @@
 	css/bootstrap.min.css
 	css/doc.css
 	css/doc-guide.css
-	css/irccd.css
 	css/tomorrow.css
 )
 
--- a/doc/html/resources/css/irccd.css	Tue Feb 23 13:26:16 2016 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,59 +0,0 @@
-/*
- * irccd.css -- style for irccd website
- */
-
-/*
-
-.color-primary-0 { color: #2C4E68 }
-.color-primary-1 { color: #6C879B }
-.color-primary-2 { color: #45667F }
-.color-primary-3 { color: #183953 }
-.color-primary-4 { color: #072338 }
-
-*/
-
-body {
-	padding-top: 70px;
-	padding-bottom: 20px;
-}
-
-pre {
-	background-color: #ffffff;
-}
-
-.jumbotron {
-	background-color: #F5F5F5;
-}
-
-.navbar {
-	background-color: #2C4E68;
-	border-color: #183953;
-}
-
-.navbar .navbar-toggle {
-	border-color: #183953;
-}
-
-.navbar .navbar-brand {
-	color: rgba(255, 255, 255, 0.9);
-}
-
-.navbar .navbar-text {
-	color: rgba(255, 255, 255, 0.9);
-}
-
-.navbar .navbar-link {
-	color: rgba(255, 255, 255, 0.9);
-}
-
-.navbar .navbar-nav>li>a {
-	color: rgba(255, 255, 255, 0.9);
-}
-
-.navbar .navbar-collapse {
-	border-color: #183953;
-}
-
-.sidebar {
-	margin-top: 50px;
-}
--- a/doc/html/resources/template.html	Tue Feb 23 13:26:16 2016 +0100
+++ b/doc/html/resources/template.html	Tue Feb 23 15:38:00 2016 +0100
@@ -13,14 +13,7 @@
     <!-- CSS -->
     <link href="$baseurl$/css/bootstrap.min.css" rel="stylesheet">
     <link href="$baseurl$/css/tomorrow.css" rel="stylesheet">
-
-$if(web)$
-    <link href="$baseurl$/css/irccd.css" rel="stylesheet">
-$endif$
-
-$if(doc)$
     <link href="$baseurl$/css/doc.css" rel="stylesheet">
-$endif$
 
 $if(guide)$
     <link href="$baseurl$/css/doc-guide.css" rel="stylesheet">
@@ -34,51 +27,8 @@
   </head>
 
   <body>
-$if(web)$
-    <nav class="navbar navbar-fixed-top navbar-inverse">
-      <div class="container">
-        <div class="navbar-header">
-          <button type="button" class="navbar-toggle collapsed" data-toggle="collapse" data-target="#navbar" aria-expanded="false" aria-controls="navbar">
-            <span class="sr-only">Toggle navigation</span>
-            <span class="icon-bar"></span>
-            <span class="icon-bar"></span>
-            <span class="icon-bar"></span>
-          </button>
-          <a class="navbar-brand" href="$baseurl$/index.html">irccd</a>
-        </div><!-- navbar-header -->
-        <div id="navbar" class="navbar-collapse collapse">
-          <ul class="nav navbar-nav">
-            <li><a href="$baseurl$/about.html">About</a></li>
-            <li><a href="$baseurl$/documentation.html">Documentation</a></li>
-            <li><a href="$baseurl$/download.html">Download</a></li>
-            <li><a href="$baseurl$/contribute.html">Contribute</a></li>
-            <li><a href="$baseurl$/support.html">Support</a></li>
-          </ul>
-          <p id="joke" class="navbar-text navbar-right">The definitive bot</p>
-        </div><!-- !navbar -->
-      </div><!-- !container -->
-    </nav>
+  <div class="container-fluid">
 
-$if(home)$
-    <!-- Main jumbotron for a primary marketing message or call to action -->
-    <div class="jumbotron">
-     <div class="container">
-      <h1>IRC Client Daemon</h1>
-      <p>Irccd is an IRC bot written in C++14 and Javascript. It is fast, light, powerful, scalable.</p>
-      <p><a class="btn btn-primary btn-lg" href="#" role="button">Download now &raquo;</a></p>
-     </div>
-    </div>
-$endif$ <!-- ! endif home -->
-$endif$ <!-- ! endif web -->
-
-$if(doc)$
-<div class="container-fluid">
-$endif$
-$if(general)$
-<div class="container">
-$endif$
-
-$if(doc)$
   <div class="row">
     <!-- Side bar -->
     <div class="col-sm-1 col-md-2 sidebar">
@@ -129,6 +79,7 @@
 $if(guide)$
 $toc$
 $endif$ <!-- endif guide -->
+
     </div><!-- Side bar -->
 
     <div class="col-sm-9 col-sm-offset-3 col-md-10 col-md-offset-2 main">
@@ -209,11 +160,6 @@
 $endif$ <!-- endif guide -->
     </div><!-- !column -->
   </div><!-- !row -->
-$endif$
-
-$if(general)$
-$body$
-$endif$ <!-- endif general -->
 
   <hr>
   <footer>
@@ -227,10 +173,6 @@
     <script src="$baseurl$/js/jquery.min.js"></script>
     <script src="$baseurl$/js/bootstrap.min.js"></script>
 
-$if(web)$
-    <script src="$baseurl$/js/joke.js"></script>
-$endif$
-
     <script src="$baseurl$/js/highlight.js"></script>
     <script>hljs.initHighlightingOnLoad();</script>
     <script>jQuery("table").addClass("table");</script>
--- a/plugins/CMakeLists.txt	Tue Feb 23 13:26:16 2016 +0100
+++ b/plugins/CMakeLists.txt	Tue Feb 23 15:38:00 2016 +0100
@@ -23,10 +23,6 @@
 	COMMENT "Irccd plugins"
 )
 
-if (WITH_WEB)
-	set(ARGS web:1)
-endif ()
-
 foreach (plugin ${IRCCD_PLUGINS})
 	string(TOUPPER ${plugin} optname)
 
@@ -52,7 +48,7 @@
 					${resources_SOURCE_DIR}/template.html
 					docs-resources
 				ARGS -Vguide
-				VARIABLE baseurl:${baseurl} doc:1 ${ARGS}
+				VARIABLE baseurl:${baseurl}
 				FROM markdown TO html5
 				STANTALONE MAKE_DIRECTORY TOC
 			)