Version 14.110.2

css/swad_desktop.css

@@ -359,7 +359,7 @@ hr.YELLOW_SEPARA	{height:0; border-top:0; border-bottom:#BD4815 dotted 1px;}
 	}
 .TIT_TBL_10
 	{
-	margin:10px;
+	margin:20px 10px 10px 10px;
 	color:#808080;
 	font-size:16pt;
 	font-weight:bold;

css/swad_mobile.css

@@ -323,7 +323,7 @@ form			{margin:0; display:inline;}
 	}
 .TIT_TBL_10
 	{
-	margin:10px;
+	margin:20px 10px 10px 10px;
 	color:#808080;
 	font-size:20pt;
 	font-weight:bold;

html/install/index.html

@@ -57,6 +57,7 @@
 		<li><a href="#swad-files">Creating SWAD directories and files</a></li>
 		<li><a href="#swad-icons">Installing SWAD icons</a></li>
 		<li><a href="#dropzone">Installing DropzoneJS</a></li>
+		<li><a href="#mathjax">Installing MathJax</a></li>
 		<li><a href="#gsoap">Compiling and installing gSOAP, required to compile SWAD core</a></li>
 		<li><a href="#compile-swad">Compiling and installing SWAD core</a></li>
 		<li><a href="#fotomaton">Installing photo processing program <code>fotomaton</code></a></li>
@@ -453,6 +454,71 @@
 	</table>
 	</li>
 
+	</ul>
+
+	<p>
+	SWAD needs <code>pandoc</code> 1.10 or later
+	and <code>iconv</code>
+	to convert from Markdown format to HTML format.
+	</p>
+
+	<ul>
+
+	<li>
+	To install <code>pandoc</code>:
+	<table width="100%">
+	<tr>
+	<th>CentOS 6.5</th>
+	<th>Ubuntu 14.04</th>
+	</tr>
+	<tr>
+	<td width="50%" valign="top">
+		<p>
+		You probably need to install the latest epel-release rpm from
+		<a href="http://dl.fedoraproject.org/pub/epel/6/x86_64/">http://dl.fedoraproject.org/pub/epel/6/x86_64/</a>:<br />
+		<code>wget http://dl.fedoraproject.org/pub/epel/6/x86_64/epel-release-6-8.noarch.rpm</code><br />
+		<code>rpm -Uvh epel-release*rpm</code><br />
+		
+		Then you can download pandoc rpm from <a href="http://pkgs.org/centos-6/epel-x86_64/pandoc-1.9.4.1-1.1.el6.x86_64.rpm.html">http://pkgs.org/centos-6/epel-x86_64/pandoc-1.9.4.1-1.1.el6.x86_64.rpm.html</a>:<br />
+		<code>wget http://dl.fedoraproject.org/pub/epel/6/x86_64/pandoc-1.9.4.1-1.1.el6.x86_64.rpm</code><br />
+		and install it:<br /> 
+		<code>yum install pandoc</code><br />
+		Unfortunately this rpm is too old, but the following rmp for Fedora works in CentOS:<br />
+		<code>wget https://petersen.fedorapeople.org/pandoc-standalone/epel-5/x86_64/pandoc-1.12.4.2-1.x86_64.rpm</code>
+		</p>
+
+		<p>
+		If you do not find a valid pandoc binary package, try to install the Haskell platform by following the instructions in
+		<a href="https://medium.com/@jtpaasch/install-haskell-on-centos-5be42b76c7a4">https://medium.com/@jtpaasch/install-haskell-on-centos-5be42b76c7a4</a>:<br />
+		<code>yum install haskell-platform</code><br />
+
+		Once Haskell is installed, follow the instructions in
+		<a href="http://johnmacfarlane.net/pandoc/installing.html#installing-from-source">http://johnmacfarlane.net/pandoc/installing.html#installing-from-source</a>:<br />
+		<code>cabal update</code><br />
+		<code>cabal install pandoc pandoc-citeproc</code><br />
+
+		This probably will fail due to an old version of the Glasgow Haskell Compiler (GHC).
+		Update it as indicated in
+		<a href="https://gist.github.com/grownseed/4fd2e91eca829cc039de">https://gist.github.com/grownseed/4fd2e91eca829cc039de</a>:<br />
+
+		<code>wget https://www.haskell.org/ghc/dist/7.8.4/ghc-7.8.4-x86_64-unknown-linux-centos65.tar.bz2</code><br />
+		<code>tar xf ghc-7.8.4-x86_64-unknown-linux-centos65.tar.bz2</code><br />
+		<code>cd ghc-7.8.4</code><br />
+		<code>./configure</code><br />
+		<code>make install</code><br />
+		
+		Then repeat:<br >
+		<code>cabal update</code><br />
+		<code>cabal install pandoc pandoc-citeproc</code>
+		</p>
+	</td>
+	<td width="50%" valign="top">
+		<code>sudo apt-get install pandoc</code>
+	</td>
+	</tr>
+	</table>
+	</li>
+
 	</ul>
 
 	</li>
@@ -481,6 +547,12 @@
 			<code>sudo service apache2 restart</code><br />
 		</p>
 		<p>
+		Optionally, if you want to rewrite some URIs,
+		activate the rewrite module:<br />
+			<code>sudo a2enmod rewrite</code><br />
+			<code>sudo service apache2 restart</code><br />
+		</p>
+		<p>
 		Activate the secure server:<br />
 			<code>sudo a2enmod ssl</code><br />
 			<code>sudo service apache2 restart</code><br />
@@ -614,7 +686,7 @@
 		</li>
 
 		<li>
-		In the options for the directory <code>/var/www/</code>,
+		Inside the options for the directory <code>/var/www/</code>,
 		search the line:<br />
 		<code>Options Indexes FollowSymLinks</code><br />
 		and replace it by:<br />
@@ -622,6 +694,18 @@
 		Remove <code>Indexes</code> to not list files in directories.
 		</li>
 
+		<li>
+		Optionally, if you want to rewrite some URIs,
+		inside the options for the directory <code>/var/www/</code>,
+		add lines like the following before <code>&lt;/Directory&gt;</code>:<br />
+		<code>RewriteEngine On</code><br />
+		<code>RewriteRule /institution/([^/]+)/?$ /swad/index.html?InsCod=$1</code><br />
+		<code>RewriteRule /centre/([^/]+)/?$ /swad/index.html?CtrCod=$1</code><br />
+		<code>RewriteRule /degree/([^/]+)/?$ /swad/index.html?DegCod=$1</code><br />
+		<code>RewriteRule /course/([^/]+)/?$ /swad/index.html?CrsCod=$1</code><br />
+		<code>RewriteRule /user/([^/]+)/?$ /swad/?Usr=$1</code>
+		</li>
+
 		</ul>
 	</td>
 	</tr>
@@ -1263,6 +1347,42 @@
 	</table>
 	</p>
 	
+	</li>
+
+	<li>
+
+	<h2><a name="mathjax">Installing MathJax</a></h2>
+
+	<p>
+	<a href="http://docs.mathjax.org/">MathJax</a> is a Javascript library required to display math.
+	In SWAD, it is used in combination with Markdown and Pandoc.
+	To install it, follow the instructions in
+	<a href="http://docs.mathjax.org/en/latest/installation.html">http://docs.mathjax.org/en/latest/installation.html</a>.
+	The directory downloaded and uncompressed must be located inside your main HTML directory
+	<code>/var/www/html/swad/</code>:<br />
+	<table width="100%">
+	<tr>
+	<th>CentOS 6.5</th>
+	<th>Ubuntu 14.04</th>
+	</tr>
+	<tr>
+	<td width="50%" valign="top">
+		<code>mv your-downloaded-copy-of-mathjax /var/www/html/swad/MathJax</code><br />
+		<code>chown -R apache:apache /var/www/html/swad/MathJax</code><br />
+		If in CentOS <a href="http://en.wikipedia.org/wiki/Security-Enhanced_Linux">SELinux</a> is activated,
+		it should be necessary to change the permissions of the directory <code>dropzone</code> and its contents:<br />
+			<code>ls -lZ /var/www/html/swad/</code><br />
+			<code>chcon -R -t httpd_sys_content_t /var/www/html/swad/MathJax</code><br />
+			<code>ls -lZ /var/www/html/swad/</code>
+	</td>
+	<td width="50%" valign="top">
+		<code>sudo mv your-downloaded-copy-of-mathjax /var/www/html/swad/MathJax</code><br />
+		<code>sudo chown -R www-data:www-data /var/www/html/swad/MathJax</code>
+	</td>
+	</tr>
+	</table>
+	</p>
+	
 	</li>
 
 	<li>

swad_changelog.h

@@ -103,17 +103,24 @@
 /****************************** Public constants *****************************/
 /*****************************************************************************/
 
-#define Log_PLATFORM_VERSION	"SWAD 14.110.1 (2015/04/08)"
+#define Log_PLATFORM_VERSION	"SWAD 14.110.2 (2015/04/09)"
 
 // Number of lines (includes comments but not blank lines) has been got with the following command:
 // nl swad*.c swad*.h css/swad*.css py/swad*.py js/swad*.js soap/swad*.h sql/swad*.sql | tail -1
 /*
+        Version 14.110.2: Apr 09, 2015	Changes in CSS and scripts.
+					MathJax installed in local by default. (184555 lines)
+					1 change in installation:
+It's necessary to install a copy of MathJax in the server at directory MathJax inside main html directory followin the instructions in http://docs.mathjax.org/en/latest/start.html
+
         Version 14.110.1: Apr 08, 2015	Changes in CSS. (184539 lines)
         Version 14.110:   Apr 07, 2015	Testing rich text editor using Markdown, suggested by Pedro A. García Sánchez. (184508 lines)
 					Fixed bug in file browser, reported by Eva Martínez Ortigosa.
 					2 changes necessary in database:
 ALTER TABLE crs_info_txt CHANGE COLUMN InfoTxt InfoTxtHTML LONGTEXT NOT NULL;
 ALTER TABLE crs_info_txt ADD COLUMN InfoTxtMD LONGTEXT NOT NULL AFTER InfoTxtHTML;
+					1 change in installation:
+It's necessary to install pandoc 1.10 or later.
 
         Version 14.109.2: Apr 06, 2015	Changed text in file browser. (184347 lines)
         Version 14.109.1: Apr 06, 2015	Changed text of button in course info. (184325 lines)

swad_config.h

@@ -428,6 +428,9 @@
 /* HTML file weitten at foot of page */
 #define Cfg_PATH_AND_FILE_REL_HTML_PRIVATE	"./foot.html"
 
+/* Comment the following line if you do not want a local copy of MathJax */
+#define Cfg_MATHJAX_LOCAL
+
 /*****************************************************************************/
 /************************ Commands called by this CGI ************************/
 /*****************************************************************************/

swad_layout.c

@@ -446,10 +446,20 @@ static void Lay_WriteScripts (void)
 	    Cfg_HTTPS_URL_SWAD_PUBLIC);
 
    /***** Script for MathJax *****/
+#ifdef Cfg_MATHJAX_LOCAL
+   // Use the local copy of MathJax
    fprintf (Gbl.F.Out,"<script type=\"text/javascript\""
-	              " src=\"https://cdn.mathjax.org/mathjax/latest/MathJax.js?config=TeX-AMS-MML_HTMLorMML\">"
+	              " src=\"%s/MathJax/MathJax.js?config=TeX-AMS-MML_HTMLorMML\">"
+	              "</script>\n",
+	    Cfg_HTTPS_URL_SWAD_PUBLIC);
+#else
+   // Use the MathJax Content Delivery Network (CDN)
+   fprintf (Gbl.F.Out,"<script type=\"text/javascript\""
+	              " src=\"//cdn.mathjax.org/mathjax/latest/MathJax.js?config=TeX-AMS-MML_HTMLorMML\">"
 	              "</script>\n");
+#endif
 
+   /***** Scripts used only in main window *****/
    if (Act_Actions[Gbl.CurrentAct].BrowserWindow == Act_MAIN_WINDOW)
      {
       Lay_WriteScriptInit ();