Thread: [Winmerge-svn] SF.net SVN: winmerge:[6973] trunk/Web/engine/page.inc
Windows visual diff and merge for files and directories
Brought to you by:
christianlist,
grimmdp
From: <ge...@us...> - 2009-08-28 13:01:59
|
Revision: 6973 http://winmerge.svn.sourceforge.net/winmerge/?rev=6973&view=rev Author: gerundt Date: 2009-08-28 13:01:53 +0000 (Fri, 28 Aug 2009) Log Message: ----------- Web: Add "canonical" URL to English pages - Fix invalid HTML 4 syntax Modified Paths: -------------- trunk/Web/engine/page.inc Modified: trunk/Web/engine/page.inc =================================================================== --- trunk/Web/engine/page.inc 2009-08-28 12:52:59 UTC (rev 6972) +++ trunk/Web/engine/page.inc 2009-08-28 13:01:53 UTC (rev 6973) @@ -129,7 +129,7 @@ $temp .= " <link rel=\"alternate\" type=\"application/rss+xml\" title=\"" . $rsstitle . "\" href=\"" . $rssurl . "\">\n"; } if ($translations->isBaseLanguage()) { //if base language... - $temp .= " <link rel=\"canonical\" href=\"" . $translations->getLink() . "\"/>\n"; + $temp .= " <link rel=\"canonical\" href=\"" . $translations->getLink() . "\">\n"; } $temp .= "</head>\n\n"; if ($onload != '') This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ge...@us...> - 2009-10-11 12:04:49
|
Revision: 7001 http://winmerge.svn.sourceforge.net/winmerge/?rev=7001&view=rev Author: gerundt Date: 2009-10-11 12:04:38 +0000 (Sun, 11 Oct 2009) Log Message: ----------- Web: Load JavaScript file only if necessary Modified Paths: -------------- trunk/Web/engine/page.inc Modified: trunk/Web/engine/page.inc =================================================================== --- trunk/Web/engine/page.inc 2009-10-07 11:40:48 UTC (rev 7000) +++ trunk/Web/engine/page.inc 2009-10-11 12:04:38 UTC (rev 7001) @@ -24,7 +24,8 @@ */ class Page { var $_title, $_charset; - var $_description, $_keywords, $_rssfeeds; + var $_description, $_keywords; + var $_javascript, $_rssfeeds; var $_tab; var $_stablerelease; @@ -36,6 +37,7 @@ $this->_charset = 'UTF-8'; $this->_description = ''; $this->_keywords = ''; + $this->_javascript = false; $this->_rssfeeds = array(); $this->_tab = TAB_HOME; /* _Stable Release */ @@ -81,6 +83,13 @@ } /** + * enable/disable JacaScript from the page + */ + function setJavaScript($value) { + $this->_javascript = $value; + } + + /** * add RSS feed to the page head */ function addRssFeed($url, $title = 'RSS') { @@ -123,7 +132,9 @@ } $temp .= " <style type=\"text/css\" media=\"screen\">@import \"/engine/css/screen.css\";</style>\n"; $temp .= " <link rel=\"stylesheet\" type=\"text/css\" media=\"print\" href=\"/engine/css/print.css\">\n"; - $temp .= " <script src=\"/engine/javascript/winmerge.js\" type=\"text/javascript\"></script>\n"; + if ($this->_javascript == true || $onload != '') { //if JavaScript is needed... + $temp .= " <script src=\"/engine/javascript/winmerge.js\" type=\"text/javascript\"></script>\n"; + } $temp .= " <link rel=\"shortcut icon\" type=\"image/x-icon\" href=\"/favicon.ico\">\n"; foreach ($this->_rssfeeds as $rssurl => $rsstitle) { //for all RSS feeds... $temp .= " <link rel=\"alternate\" type=\"application/rss+xml\" title=\"" . $rsstitle . "\" href=\"" . $rssurl . "\">\n"; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ge...@us...> - 2009-11-21 14:27:19
|
Revision: 7038 http://winmerge.svn.sourceforge.net/winmerge/?rev=7038&view=rev Author: gerundt Date: 2009-11-21 14:27:13 +0000 (Sat, 21 Nov 2009) Log Message: ----------- Web: Add "hreflang" to language links Modified Paths: -------------- trunk/Web/engine/page.inc Modified: trunk/Web/engine/page.inc =================================================================== --- trunk/Web/engine/page.inc 2009-11-21 14:17:54 UTC (rev 7037) +++ trunk/Web/engine/page.inc 2009-11-21 14:27:13 UTC (rev 7038) @@ -396,10 +396,10 @@ $languages = $translations->getLanguages(); foreach ($languages as $language) { //for all languages... if ($translations->isActiveLanguage($language)) { //if current language... - $temp .= " <li><strong><a href=\"" . $translations->getLink($language, true) . "\">" . __($language->getName()) . "</a></strong></li>\n"; + $temp .= " <li><strong><a href=\"" . $translations->getLink($language, true) . "\" hreflang=\"" . $language->getId() . "\">" . __($language->getName()) . "</a></strong></li>\n"; } else { //if NOT current language... - $temp .= " <li><a href=\"" . $translations->getLink($language, true) . "\">" . __($language->getName()) . "</a></li>\n"; + $temp .= " <li><a href=\"" . $translations->getLink($language, true) . "\" hreflang=\"" . $language->getId() . "\">" . __($language->getName()) . "</a></li>\n"; } } $temp .= "</ul>\n"; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ge...@us...> - 2010-04-23 08:52:06
|
Revision: 7133 http://winmerge.svn.sourceforge.net/winmerge/?rev=7133&view=rev Author: gerundt Date: 2010-04-23 08:52:00 +0000 (Fri, 23 Apr 2010) Log Message: ----------- Web: Don't prepare link for manual and tour Modified Paths: -------------- trunk/Web/engine/page.inc Modified: trunk/Web/engine/page.inc =================================================================== --- trunk/Web/engine/page.inc 2010-04-23 08:47:21 UTC (rev 7132) +++ trunk/Web/engine/page.inc 2010-04-23 08:52:00 UTC (rev 7133) @@ -303,8 +303,8 @@ break; case TAB_DOCS: //if "Documentation" ... $subtabs[0] = new Subtab($translations->prepareLink('/docs/'), __('Index'), __('WinMerge Documentation')); - $subtabs[1] = new Subtab($translations->prepareLink('/docs/manual/'), __('Manual'), __('WinMerge Manual')); - $subtabs[2] = new Subtab($translations->prepareLink('/docs/tour/'), __('Quick Tour'), __('WinMerge Quick Tour')); + $subtabs[1] = new Subtab('/docs/manual/', __('Manual'), __('WinMerge Manual')); + $subtabs[2] = new Subtab('/docs/tour/', __('Quick Tour'), __('WinMerge Quick Tour')); $subtabs[3] = new Subtab($translations->prepareLink('/docs/releasenotes.php'), __('Release Notes'), __('WinMerge Release Notes')); $subtabs[4] = new Subtab($translations->prepareLink('/docs/releasenotes.php#issues'), __('Known Issues'), __('WinMerge Known Issues')); $subtabs[5] = new Subtab($translations->prepareLink('/docs/changelog.php'), __('Change Log'), __('WinMerge Change Log')); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ge...@us...> - 2010-04-23 08:57:49
|
Revision: 7134 http://winmerge.svn.sourceforge.net/winmerge/?rev=7134&view=rev Author: gerundt Date: 2010-04-23 08:57:43 +0000 (Fri, 23 Apr 2010) Log Message: ----------- Web: Update Piwik java script code Modified Paths: -------------- trunk/Web/engine/page.inc Modified: trunk/Web/engine/page.inc =================================================================== --- trunk/Web/engine/page.inc 2010-04-23 08:52:00 UTC (rev 7133) +++ trunk/Web/engine/page.inc 2010-04-23 08:57:43 UTC (rev 7134) @@ -414,15 +414,15 @@ function getPiwikCode() { $temp = "<!-- Piwik -->\n"; $temp .= "<script type=\"text/javascript\">\n"; - $temp .= "var pkBaseURL = ((\"https:\" == document.location.protocol) ? \"https://apps.sourceforge.net/piwik/winmerge/\" : \"http://apps.sourceforge.net/piwik/winmerge/\");\n"; + $temp .= "var pkBaseURL = ((\"https:\" == document.location.protocol) ? \"https://sourceforge.net/apps/piwik/winmerge/\" : \"http://sourceforge.net/apps/piwik/winmerge/\");\n"; $temp .= "document.write(unescape(\"%3Cscript src='\" + pkBaseURL + \"piwik.js' type='text/javascript'%3E%3C/script%3E\"));\n"; $temp .= "</script><script type=\"text/javascript\">\n"; - $temp .= "piwik_action_name = '';\n"; - $temp .= "piwik_idsite = 1;\n"; - $temp .= "piwik_url = pkBaseURL + \"piwik.php\";\n"; - $temp .= "piwik_log(piwik_action_name, piwik_idsite, piwik_url);\n"; - $temp .= "</script>\n"; - $temp .= "<object><noscript><p><img src=\"http://apps.sourceforge.net/piwik/winmerge/piwik.php?idsite=1\" alt=\"piwik\"/></p></noscript></object>\n"; + $temp .= "try {\n"; + $temp .= "var piwikTracker = Piwik.getTracker(pkBaseURL + \"piwik.php\", 1);\n"; + $temp .= "piwikTracker.trackPageView();\n"; + $temp .= "piwikTracker.enableLinkTracking();\n"; + $temp .= "} catch( err ) {}\n"; + $temp .= "</script><noscript><p><img src=\"http://sourceforge.net/apps/piwik/winmerge/piwik.php?idsite=1\" style=\"border:0\" alt=\"\"/></p></noscript>\n"; $temp .= "<!-- End Piwik Tag -->\n"; return $temp; } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |