diff options
| -rw-r--r-- | 3rdParty/captcha/Makefile | 209 | ||||
| -rw-r--r-- | templates/login.tmpl | 13 | ||||
| -rw-r--r-- | templates/master.tmpl | 3 |
3 files changed, 10 insertions, 215 deletions
diff --git a/3rdParty/captcha/Makefile b/3rdParty/captcha/Makefile deleted file mode 100644 index 17b9314..0000000 --- a/3rdParty/captcha/Makefile +++ /dev/null @@ -1,209 +0,0 @@ -# CMAKE generated file: DO NOT EDIT! -# Generated by "Unix Makefiles" Generator, CMake Version 3.2 - -# Default target executed when no arguments are given to make. -default_target: all -.PHONY : default_target - -# Allow only one "make -f Makefile2" at a time, but pass parallelism. -.NOTPARALLEL: - -#============================================================================= -# Special targets provided by cmake. - -# Disable implicit rules so canonical targets will work. -.SUFFIXES: - -# Remove some rules from gmake that .SUFFIXES does not remove. -SUFFIXES = - -.SUFFIXES: .hpux_make_needs_suffix_list - -# Suppress display of executed commands. -$(VERBOSE).SILENT: - -# A target that is always out of date. -cmake_force: -.PHONY : cmake_force - -#============================================================================= -# Set environment variables for the build. - -# The shell in which to execute make rules. -SHELL = /bin/sh - -# The CMake executable. -CMAKE_COMMAND = /usr/bin/cmake - -# The command to remove a file. -RM = /usr/bin/cmake -E remove -f - -# Escaping for special characters. -EQUALS = = - -# The top-level source directory on which CMake was run. -CMAKE_SOURCE_DIR = /home/abaumann/strusCms - -# The top-level build directory on which CMake was run. -CMAKE_BINARY_DIR = /home/abaumann/strusCms - -#============================================================================= -# Targets provided globally by CMake. - -# Special rule for the target edit_cache -edit_cache: - @$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Running CMake cache editor..." - /usr/bin/ccmake -H$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR) -.PHONY : edit_cache - -# Special rule for the target edit_cache -edit_cache/fast: edit_cache -.PHONY : edit_cache/fast - -# Special rule for the target rebuild_cache -rebuild_cache: - @$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Running CMake to regenerate build system..." - /usr/bin/cmake -H$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR) -.PHONY : rebuild_cache - -# Special rule for the target rebuild_cache -rebuild_cache/fast: rebuild_cache -.PHONY : rebuild_cache/fast - -# The main all target -all: cmake_check_build_system - cd /home/abaumann/strusCms && $(CMAKE_COMMAND) -E cmake_progress_start /home/abaumann/strusCms/CMakeFiles /home/abaumann/strusCms/3rdParty/captcha/CMakeFiles/progress.marks - cd /home/abaumann/strusCms && $(MAKE) -f CMakeFiles/Makefile2 3rdParty/captcha/all - $(CMAKE_COMMAND) -E cmake_progress_start /home/abaumann/strusCms/CMakeFiles 0 -.PHONY : all - -# The main clean target -clean: - cd /home/abaumann/strusCms && $(MAKE) -f CMakeFiles/Makefile2 3rdParty/captcha/clean -.PHONY : clean - -# The main clean target -clean/fast: clean -.PHONY : clean/fast - -# Prepare targets for installation. -preinstall: all - cd /home/abaumann/strusCms && $(MAKE) -f CMakeFiles/Makefile2 3rdParty/captcha/preinstall -.PHONY : preinstall - -# Prepare targets for installation. -preinstall/fast: - cd /home/abaumann/strusCms && $(MAKE) -f CMakeFiles/Makefile2 3rdParty/captcha/preinstall -.PHONY : preinstall/fast - -# clear depends -depend: - cd /home/abaumann/strusCms && $(CMAKE_COMMAND) -H$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR) --check-build-system CMakeFiles/Makefile.cmake 1 -.PHONY : depend - -# Convenience name for target. -3rdParty/captcha/CMakeFiles/captcha.dir/rule: - cd /home/abaumann/strusCms && $(MAKE) -f CMakeFiles/Makefile2 3rdParty/captcha/CMakeFiles/captcha.dir/rule -.PHONY : 3rdParty/captcha/CMakeFiles/captcha.dir/rule - -# Convenience name for target. -captcha: 3rdParty/captcha/CMakeFiles/captcha.dir/rule -.PHONY : captcha - -# fast build rule for target. -captcha/fast: - cd /home/abaumann/strusCms && $(MAKE) -f 3rdParty/captcha/CMakeFiles/captcha.dir/build.make 3rdParty/captcha/CMakeFiles/captcha.dir/build -.PHONY : captcha/fast - -# Convenience name for target. -3rdParty/captcha/CMakeFiles/unfont.dir/rule: - cd /home/abaumann/strusCms && $(MAKE) -f CMakeFiles/Makefile2 3rdParty/captcha/CMakeFiles/unfont.dir/rule -.PHONY : 3rdParty/captcha/CMakeFiles/unfont.dir/rule - -# Convenience name for target. -unfont: 3rdParty/captcha/CMakeFiles/unfont.dir/rule -.PHONY : unfont - -# fast build rule for target. -unfont/fast: - cd /home/abaumann/strusCms && $(MAKE) -f 3rdParty/captcha/CMakeFiles/unfont.dir/build.make 3rdParty/captcha/CMakeFiles/unfont.dir/build -.PHONY : unfont/fast - -captcha.o: captcha.c.o -.PHONY : captcha.o - -# target to build an object file -captcha.c.o: - cd /home/abaumann/strusCms && $(MAKE) -f 3rdParty/captcha/CMakeFiles/captcha.dir/build.make 3rdParty/captcha/CMakeFiles/captcha.dir/captcha.c.o -.PHONY : captcha.c.o - -captcha.i: captcha.c.i -.PHONY : captcha.i - -# target to preprocess a source file -captcha.c.i: - cd /home/abaumann/strusCms && $(MAKE) -f 3rdParty/captcha/CMakeFiles/captcha.dir/build.make 3rdParty/captcha/CMakeFiles/captcha.dir/captcha.c.i -.PHONY : captcha.c.i - -captcha.s: captcha.c.s -.PHONY : captcha.s - -# target to generate assembly for a file -captcha.c.s: - cd /home/abaumann/strusCms && $(MAKE) -f 3rdParty/captcha/CMakeFiles/captcha.dir/build.make 3rdParty/captcha/CMakeFiles/captcha.dir/captcha.c.s -.PHONY : captcha.c.s - -unfont.o: unfont.c.o -.PHONY : unfont.o - -# target to build an object file -unfont.c.o: - cd /home/abaumann/strusCms && $(MAKE) -f 3rdParty/captcha/CMakeFiles/unfont.dir/build.make 3rdParty/captcha/CMakeFiles/unfont.dir/unfont.c.o -.PHONY : unfont.c.o - -unfont.i: unfont.c.i -.PHONY : unfont.i - -# target to preprocess a source file -unfont.c.i: - cd /home/abaumann/strusCms && $(MAKE) -f 3rdParty/captcha/CMakeFiles/unfont.dir/build.make 3rdParty/captcha/CMakeFiles/unfont.dir/unfont.c.i -.PHONY : unfont.c.i - -unfont.s: unfont.c.s -.PHONY : unfont.s - -# target to generate assembly for a file -unfont.c.s: - cd /home/abaumann/strusCms && $(MAKE) -f 3rdParty/captcha/CMakeFiles/unfont.dir/build.make 3rdParty/captcha/CMakeFiles/unfont.dir/unfont.c.s -.PHONY : unfont.c.s - -# Help Target -help: - @echo "The following are some of the valid targets for this Makefile:" - @echo "... all (the default if no target is provided)" - @echo "... clean" - @echo "... depend" - @echo "... edit_cache" - @echo "... rebuild_cache" - @echo "... captcha" - @echo "... unfont" - @echo "... captcha.o" - @echo "... captcha.i" - @echo "... captcha.s" - @echo "... unfont.o" - @echo "... unfont.i" - @echo "... unfont.s" -.PHONY : help - - - -#============================================================================= -# Special targets to cleanup operation of make. - -# Special rule to run CMake to check the build system integrity. -# No rule that depends on this can have commands that come from listfiles -# because they might be regenerated. -cmake_check_build_system: - cd /home/abaumann/strusCms && $(CMAKE_COMMAND) -H$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR) --check-build-system CMakeFiles/Makefile.cmake 0 -.PHONY : cmake_check_build_system - diff --git a/templates/login.tmpl b/templates/login.tmpl index f89cf93..d4cc8a2 100644 --- a/templates/login.tmpl +++ b/templates/login.tmpl @@ -8,11 +8,14 @@ <% template page_content() %> <div> - <form method="post" action=""><% csrf %> - <table> - <% form as_table login %> - </table> - </form> + <form method="post" action=""><% csrf %> + <table> + <% form as_table login %> + </table> + </form> + </div> + <div> + Register for a new account <a href="<%= register_link %>">here</a>. </div> <% end template %> diff --git a/templates/master.tmpl b/templates/master.tmpl index 220e840..8db6b6a 100644 --- a/templates/master.tmpl +++ b/templates/master.tmpl @@ -32,7 +32,8 @@ <div id="content"> <h2><% include title( ) %></h2> <% if not empty username %> - <p>Logged in as <%= username %><p> + <p>Logged in as <%= username %> + <a href="<%= logout_link %>">Logout</a></p> <% else %> <p>Currently not logged in</p> <% end %> |