Merge branch 'master' into sipb
authorQuentin Smith <quentin@mit.edu>
Sun, 25 Jan 2015 03:49:03 +0000 (22:49 -0500)
committerQuentin Smith <quentin@mit.edu>
Sun, 25 Jan 2015 03:49:03 +0000 (22:49 -0500)
Conflicts:
po/Makefile
templates/page.tmpl

1  2 
IkiWiki/CGI.pm
IkiWiki/Plugin/git.pm
IkiWiki/Plugin/mdwn.pm
IkiWiki/Wrapper.pm
templates/page.tmpl

diff --cc IkiWiki/CGI.pm
Simple merge
Simple merge
Simple merge
index e846f8dc16ac12885a9f75a3853fae1fcc726b36,4c99cdaa0b670080ac8548e8d95de91b7b74de07..f3972ac13011dd61ed193ed80c88f460863056c2
@@@ -49,9 -49,10 +49,10 @@@ sub gen_wrapper () 
        my @envsave;
        push @envsave, qw{REMOTE_ADDR QUERY_STRING REQUEST_METHOD REQUEST_URI
                       CONTENT_TYPE CONTENT_LENGTH GATEWAY_INTERFACE
 -                     HTTP_COOKIE REMOTE_USER HTTPS REDIRECT_STATUS
 +                     HTTP_COOKIE REMOTE_USER HTTPS SSL_CLIENT_S_DN_CN REDIRECT_STATUS
                       HTTP_HOST SERVER_PORT HTTPS HTTP_ACCEPT
                       REDIRECT_URL} if $config{cgi};
+       my $envsize=$#envsave;
        my $envsave="";
        foreach my $var (@envsave) {
                $envsave.=<<"EOF";
index 9ec65205862a2db28cf479b17e388a24a8e9dcec,9e8b330a4a25124eb799b52ad9b840b0c6105fd6..496bc0aad09fe5b96298468995d86f1c2cdb170c
@@@ -1,9 -1,5 +1,5 @@@
- <TMPL_IF HTML5><!DOCTYPE html>
- <html lang="en">
- <TMPL_ELSE><!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
-  "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+ <!DOCTYPE html>
 -<html xmlns="http://www.w3.org/1999/xhtml">
 +<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
- </TMPL_IF>
  <head>
  <TMPL_IF DYNAMIC>
  <TMPL_IF FORCEBASEURL><base href="<TMPL_VAR FORCEBASEURL>" /><TMPL_ELSE>
  </TMPL_IF>
  <TMPL_IF HTML5><meta charset="utf-8" /><TMPL_ELSE><meta http-equiv="Content-Type" content="text/html; charset=utf-8" /></TMPL_IF>
  <title><TMPL_VAR TITLE></title>
 -<TMPL_IF FAVICON>
 -<link rel="icon" href="<TMPL_VAR BASEURL><TMPL_VAR FAVICON>" type="image/x-icon" />
 -</TMPL_IF>
 -<link rel="stylesheet" href="<TMPL_VAR BASEURL>style.css" type="text/css" />
 -<TMPL_IF LOCAL_CSS>
 -<link rel="stylesheet" href="<TMPL_VAR BASEURL><TMPL_VAR LOCAL_CSS>" type="text/css" />
 -<TMPL_ELSE>
 -<link rel="stylesheet" href="<TMPL_VAR BASEURL>local.css" type="text/css" />
 -</TMPL_IF>
 -
 -<TMPL_UNLESS DYNAMIC>
+ <TMPL_IF RESPONSIVE_LAYOUT><meta name="viewport" content="width=device-width, initial-scale=1" /></TMPL_IF>
 +<meta http-equiv="Content-Style-Type" content="text/css" />
 +<meta name="robots" content="all" />
 +<meta name="author" content="SIPB" />
 +<meta name="description" content="MIT Student Information Processing Board" />        
 +<meta name="keywords" content="SIPB, MIT, hackers" />
 +<link rel="stylesheet" type="text/css" href="<TMPL_VAR BASEURL>style.css" />
  <TMPL_IF EDITURL>
  <link rel="alternate" type="application/x-wiki" title="Edit this page" href="<TMPL_VAR EDITURL>" />
  </TMPL_IF>