crtxcr/qswiki
1
0
Fork 0
Code Issues 21 Pull Requests 1 Releases Activity

remove spaces etc. at end of line (no functional change)

Browse Source
This commit is contained in:
Albert S. 2019-10-02 22:06:19 +02:00
parent 559baf65da
commit 0f6d1abbd5
6 changed files with 19 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
Makefile
View File

@ -11,22 +11,22 @@ SOURCES=$(wildcard *.cpp)
SOURCES+=$(wildcard gateway/*.cpp) SOURCES+=$(wildcard gateway/*.cpp)
SOURCES+=$(wildcard handlers/*.cpp) SOURCES+=$(wildcard handlers/*.cpp)
SOURCES+=$(wildcard database/*.cpp) SOURCES+=$(wildcard database/*.cpp)
SOURCES+=$(wildcard cache/*.cpp) SOURCES+=$(wildcard cache/*.cpp)
SOURCES+=$(wildcard sandbox/*.cpp) SOURCES+=$(wildcard sandbox/*.cpp)
HEADERS=$(wildcard *.h) HEADERS=$(wildcard *.h)
HEADERS+=$(wildcard gateway/*.h) HEADERS+=$(wildcard gateway/*.h)
HEADERS+=$(wildcard handlers/*.h) HEADERS+=$(wildcard handlers/*.h)
HEADERS+=$(wildcard database/*.h) HEADERS+=$(wildcard database/*.h)
HEADERS+=$(wildcard cache/*.h) HEADERS+=$(wildcard cache/*.h)
HEADERS+=$(wildcard sandbox/*.h) HEADERS+=$(wildcard sandbox/*.h)
OBJECTS=$(patsubst %.cpp, %.o, $(SOURCES)) OBJECTS=$(patsubst %.cpp, %.o, $(SOURCES))
WIKIOBJECTS=$(filter-out test.o, $(OBJECTS)) WIKIOBJECTS=$(filter-out test.o, $(OBJECTS))
TESTOBJECTS=$(filter-out qswiki.o, $(OBJECTS)) TESTOBJECTS=$(filter-out qswiki.o, $(OBJECTS))
DEPENDS = ${WIKIOBJECTS:.o=.d} DEPENDS = ${WIKIOBJECTS:.o=.d}
-include ${DEPENDS} -include ${DEPENDS}
# Points to the root of Google Test, relative to where this file is. # Points to the root of Google Test, relative to where this file is.
# Remember to tweak this if you move this file. # Remember to tweak this if you move this file.
@ -43,18 +43,18 @@ GTEST_OBJECTS=$(filter-out qswiki.o, $(WIKIOBJECTS))
release: CXXFLAGS=$(RELEASE_CXXFLAGS) release: CXXFLAGS=$(RELEASE_CXXFLAGS)
release: qswiki release: qswiki
qswiki: $(WIKIOBJECTS) qswiki: $(WIKIOBJECTS)
$(CXX) $(WIKIOBJECTS) ${LDFLAGS} -I database/hdr -o qswiki $(CXX) $(WIKIOBJECTS) ${LDFLAGS} -I database/hdr -o qswiki
test: $(TESTOBJECTS) test: $(TESTOBJECTS)
$(CXX) $(TESTOBJECTS) ${LDFLAGS} -o test $(CXX) $(TESTOBJECTS) ${LDFLAGS} -o test
gtest: $(GTESTS_TESTDIR)/*.cpp $(GTEST_OBJECTS) gtest: $(GTESTS_TESTDIR)/*.cpp $(GTEST_OBJECTS)
$(CXX) -o gtest $(GTESTS_TESTDIR)/*.cpp $(GTEST_OBJECTS) $(GTEST_CXXFLAGS) $(GTEST_DIR)/src/gtest_main.cc $(GTEST_DIR)/src/gtest-all.cc $(GTEST_LDFLAGS) $(CXX) -o gtest $(GTESTS_TESTDIR)/*.cpp $(GTEST_OBJECTS) $(GTEST_CXXFLAGS) $(GTEST_DIR)/src/gtest_main.cc $(GTEST_DIR)/src/gtest-all.cc $(GTEST_LDFLAGS)
%.o:%.cpp %.o:%.cpp
$(CXX) ${CXXFLAGS} ${LDFLAGS} -I database/hdr -c -o $@ $< $(CXX) ${CXXFLAGS} ${LDFLAGS} -I database/hdr -c -o $@ $<
clean: clean:
rm -f $(OBJECTS) $(DEPENDS) rm -f $(OBJECTS) $(DEPENDS)

2
template/quitesimple/admin_register
View File

@ -1,7 +1,7 @@
{qswiki:include:general_header} {qswiki:include:general_header}
<main id="content"> <main id="content">
<h2>Login</h2> <h2>Login</h2>
Register a new user Register a new user
<form action="{qswiki:var:adminregisterurl}" method="POST"> <form action="{qswiki:var:adminregisterurl}" method="POST">
Username: <input type="text" name="user"></input><br> Username: <input type="text" name="user"></input><br>
Password: <input type="password" name="password"></input><br> Password: <input type="password" name="password"></input><br>

2
template/quitesimple/general_header
View File

@ -14,7 +14,7 @@
<li><a href="{qswiki:config:linkallpages}">All pages</a></li> <li><a href="{qswiki:config:linkallpages}">All pages</a></li>
<li><a href="{qswiki:config:linkallcats}">All categories</a></li> <li><a href="{qswiki:config:linkallcats}">All categories</a></li>
</ul> </ul>
<ul id="right" class="search"> <ul id="right" class="search">
<li><div><form action="{qswiki:config:wikipath}" method="GET"><input type="hidden" name="action" value="search"/><input type="text" name="q"value="search here" onfocus="this.value=''"></form></div></li> <li><div><form action="{qswiki:config:wikipath}" method="GET"><input type="hidden" name="action" value="search"/><input type="text" name="q"value="search here" onfocus="this.value=''"></form></div></li>
</ul> </ul>

6
template/quitesimple/js_session_refresh
View File

@ -1,5 +1,5 @@
function refreshSession() function refreshSession()
{ {
fetch(new Request("{qswiki:config:refreshsessionurl}")); fetch(new Request("{qswiki:config:refreshsessionurl}"));
} }
setInterval(refreshSession, 60*2*1000); setInterval(refreshSession, 60*2*1000);

4
template/quitesimple/page_header
View File

@ -14,11 +14,11 @@
<li><a href="{qswiki:config:linkallpages}">All pages</a></li> <li><a href="{qswiki:config:linkallpages}">All pages</a></li>
<li><a href="{qswiki:config:linkallcats}">All categories</a></li> <li><a href="{qswiki:config:linkallcats}">All categories</a></li>
</ul> </ul>
<ul> <ul>
{qswiki:var:headerlinks} {qswiki:var:headerlinks}
</ul> </ul>
<ul id="right" class="search"> <ul id="right" class="search">
<li><div><form action="{qswiki:config:wikipath}" method="GET"><input type="hidden" name="action" value="search"/><input type="text" value="search here" onfocus="this.value=''" name="q"/></form></div></li> <li><div><form action="{qswiki:config:wikipath}" method="GET"><input type="hidden" name="action" value="search"/><input type="text" value="search here" onfocus="this.value=''" name="q"/></form></div></li>
</ul> </ul>

6
template/quitesimple/style.css
View File

@ -29,7 +29,7 @@ h1, h2, h3
nav nav
{ {
padding: 0px; padding: 0px;
margin: 0px; margin: 0px;
display: flex; display: flex;
background-color: #062463; background-color: #062463;
justify-content: space-between; justify-content: space-between;
@ -92,7 +92,7 @@ a:hover
{ {
background-color: #062463; background-color: #062463;
color: white; color: white;
} }
#content #content
@ -137,7 +137,7 @@ list-style-type: none;
{ {
background-color: #062463; background-color: #062463;
color: white; color: white;
} }
footer footer