tinycm rev 8
Tiny edits
| author | Paul Issott <paul@slitaz.org> |
|---|---|
| date | Sun Apr 22 10:49:23 2012 +0100 (2012-04-22) |
| parents | 4067b670d4ee |
| children | c232bee4c3d3 |
| files | README index.cgi lib/functions.js plugins/export/export.cgi plugins/skel/skel.cgi tools/serv.sh |
line diff
1.1 --- a/README Wed Apr 11 16:18:59 2012 +0200 1.2 +++ b/README Sun Apr 22 10:49:23 2012 +0100 1.3 @@ -2,25 +2,25 @@ 1.4 ================================================================================ 1.5 1.6 1.7 - * CGI/Shell powered, small Wiki syntaxe and HTML JS editor helper 1.8 + * CGI/Shell powered, small Wiki syntax and HTML JS editor helper 1.9 * Tiny, fast, elegent and easy to install and customize 1.10 * No database, flat file storage with diff and log 1.11 * Plugins support for any kind of functions such as a blog 1.12 * Help file with formating rules, macro and HTML example code 1.13 - * Gettexte support and languages support for documents 1.14 + * Gettext support and languages support for documents 1.15 1.16 1.17 Installation 1.18 ------------ 1.19 You must first get TinyCM source code via a tarball on SliTaz mirrors or Hg 1.20 repository. You can extract or clone the CM under a web server directory, 1.21 -for security reason the config file have a .cgi extension and users data are 1.22 -stored outsite the web server in the directory /var/lib/slitaz. The user 1.23 +for security reasons the config file has a .cgi extension and users data are 1.24 +stored outside the web server in the directory /var/lib/slitaz. The user 1.25 files paths can be changed via the configuration file. 1.26 1.27 -When you have your copy of TinyCM you can then install web interface under a 1.28 +When you have your copy of TinyCM you can then install a web interface under a 1.29 CGI/SHell enabled web server such as Busybox HTTPd, LightTPD or Apache. Gettext 1.30 -must be installed for localisation support. So, let download Content Manager: 1.31 +must be installed for localisation support. So, let's download the Content Manager: 1.32 1.33 $ wget http://mirror.slitaz.org/sources/tinycm/tinycm-VERSION.tar.gz 1.34 $ tar xzf tinycm-VERSION.tar.gz 1.35 @@ -30,7 +30,7 @@ 1.36 $ hg clone http://hg.slitaz.org/tinycm 1.37 1.38 1.39 -Change directory to the CM, check and edit the configuration file config.cgi 1.40 +Change directory to the CM, check and edit the configuration file config.cgi, 1.41 and use make to install: 1.42 1.43 $ cd tinycm* 1.44 @@ -40,9 +40,9 @@ 1.45 1.46 Standalone Server 1.47 ----------------- 1.48 -On SliTaz you can install a copy of TinyCM somewhere under you $HOME directory 1.49 +On SliTaz you can install a copy of TinyCM anywhere under your $HOME directory 1.50 and start the stand alone web server powered by Busybox HTTPd applet. This also 1.51 -help to debug TazCM since error messages are displayed in the terminal. To 1.52 +helps to debug TazCM since error messages are displayed in the terminal. To 1.53 start the server, cd to TinyCM dir and execute: 1.54 1.55 $ ./tinycm serv 1.56 @@ -50,15 +50,15 @@ 1.57 1.58 Mercurial integration 1.59 --------------------- 1.60 -TinyCM can smothily be integrated with Mercurial, each new document and edit 1.61 +TinyCM can be integrated smoothly with Mercurial, each new document and edit 1.62 will be committed. You must first edit you config.cgi configuration to 1.63 -enable Hg with HG="yes" then login to your TinyCM follow the link to init the 1.64 +enable Hg with HG="yes" then login to your TinyCM, follow the link to init the 1.65 repo or do it manually: cd content && hg init && hg add && hg commit -m "Message" 1.66 1.67 -Then all content will be under Hg and people can commit as usual, to make sure 1.68 -we use the last files on the web interface we use a Hook to update the repo on 1.69 +Then all content will be under Hg and people can commit as usual. To make sure 1.70 +we use the latest files on the web interface we use a Hook to update the repo on 1.71 each commit. To have the mercurial web interface for the repo you can setup 1.72 -a vhost, TinyCM provide a small web interface to display Hg log but it can 1.73 +a vhost, TinyCM provides a small web interface to display a Hg log but it can 1.74 be extented via a plugin. Hook for $content/.hg/hgrc: 1.75 1.76 [hooks]
2.1 --- a/index.cgi Wed Apr 11 16:18:59 2012 +0200 2.2 +++ b/index.cgi Sun Apr 22 10:49:23 2012 +0100 2.3 @@ -6,7 +6,7 @@ 2.4 # 2.5 . /usr/lib/slitaz/httphelper 2.6 2.7 -# Let have a peer site config file with a .cgi extension so content 2.8 +# Let's have a peer site config file with a .cgi extension so content 2.9 # is secure even if left in a web server directory. 2.10 . config.cgi 2.11 2.12 @@ -43,7 +43,7 @@ 2.13 # Functions 2.14 # 2.15 2.16 -# Used by edit to display language name and the language box. this is 2.17 +# Used by edit to display language name and the language box. This is 2.18 # for CM content not gettext support. 2.19 get_lang() { 2.20 lang=$(echo $d | cut -d "/" -f 1) 2.21 @@ -107,7 +107,7 @@ 2.22 cat > $wiki/$index.txt << EOT 2.23 ==== Welcome ==== 2.24 2.25 -This is the default index page of your CM, you can edit to start adding 2.26 +This is the default index page of your CM, you can start to edit adding 2.27 some content to your TinyCM. 2.28 2.29 EOT 2.30 @@ -181,7 +181,7 @@ 2.31 <h2>$(gettext "Login")</h2> 2.32 2.33 <div id="account-info"> 2.34 -$(gettext "Not yet and account or trouble with you account? Please send 2.35 +$(gettext "No account yet or trouble with you account? Please send 2.36 a request to $ADMIN_MAIL with your real name, user name, mail and password.") 2.37 $(online_signup) 2.38 </div> 2.39 @@ -258,8 +258,8 @@ 2.40 EOT 2.41 } 2.42 2.43 -# The CM style parser. Just title, simple text formating and internal 2.44 -# link, as well as images and use HTML for other stuff. Keep it fast! 2.45 +# The CM style parser. Just a title, simple text formating and internal 2.46 +# links, as well as images and use HTML for other stuff. Keep it fast! 2.47 # To make TinyCM as easy as possible we have a small HTML editor/helper 2.48 # written in Javascript 2.49 wiki_parser() { 2.50 @@ -386,7 +386,7 @@ 2.51 header 2.52 html_header 2.53 user_box 2.54 - echo "<h2>gettext "User already exist: $user"</h2>" 2.55 + echo "<h2>gettext "User already exists: $user"</h2>" 2.56 html_footer 2.57 fi ;; 2.58 esac 2.59 @@ -429,7 +429,7 @@ 2.60 </div> 2.61 EOT 2.62 else 2.63 - gettext "You must be logged to edit pages" 2.64 + gettext "You must be logged in to edit pages" 2.65 fi 2.66 html_footer ;; 2.67 *\ save\ *) 2.68 @@ -499,7 +499,7 @@ 2.69 if [ "$ONLINE_SIGNUP" == "yes" ]; then 2.70 signup_page 2.71 else 2.72 - gettext "Online registration is disable" 2.73 + gettext "Online registration is disabled" 2.74 fi 2.75 html_footer ;; 2.76 *\ logout\ *) 2.77 @@ -548,7 +548,7 @@ 2.78 done 2.79 echo '</pre>' 2.80 else 2.81 - gettext "You must be logged to view the dashboard." 2.82 + gettext "You must be logged in to view the dashboard." 2.83 fi 2.84 html_footer ;; 2.85 *\ hg\ *) 2.86 @@ -568,7 +568,7 @@ 2.87 cd $content/ && hg init 2.88 echo '[hooks]' > .hg/hgrc 2.89 echo 'incoming = hg update' >> .hg/hgrc 2.90 - gettext "Adding current content and commiting"; echo 2.91 + gettext "Adding current content and committing"; echo 2.92 [ ! -f "$wiki/index.txt" ] && touch $wiki/$index.txt 2.93 hg add && hg commit -u "$NAME <$MAIL>" \ 2.94 -m "Initial commit with curent content"
3.1 --- a/lib/functions.js Wed Apr 11 16:18:59 2012 +0200 3.2 +++ b/lib/functions.js Sun Apr 22 10:49:23 2012 +0100 3.3 @@ -1,5 +1,5 @@ 3.4 3.5 -// Insert HTML code into editor textarea. 3.6 +// Insert HTML code into editor text area. 3.7 function addCode(code) { 3.8 document.forms["editor"]["content"].value = 3.9 document.forms["editor"]["content"].value += code;
4.1 --- a/plugins/export/export.cgi Wed Apr 11 16:18:59 2012 +0200 4.2 +++ b/plugins/export/export.cgi Sun Apr 22 10:49:23 2012 +0100 4.3 @@ -14,7 +14,7 @@ 4.4 cat << EOT 4.5 <h2>Export</h2> 4.6 <p> 4.7 -$(gettext "Export to HTML and ceate a tarball of your text content or 4.8 +$(gettext "Export to HTML and create a tarball of your text content or 4.9 uploaded files.") 4.10 </p> 4.11 <form method="get" action="$WEB_URL">
5.1 --- a/plugins/skel/skel.cgi Wed Apr 11 16:18:59 2012 +0200 5.2 +++ b/plugins/skel/skel.cgi Sun Apr 22 10:49:23 2012 +0100 5.3 @@ -14,7 +14,7 @@ 5.4 5.5 # Say we use files in $DATA/skel, sort them by date and simply cat 5.6 # the files, this will create a simple blog :-) We may add post via 5.7 - # uploads or an HTML form. 5.8 + # uploads or a HTML form. 5.9 5.10 html_footer 5.11 exit 0