[xoops-svn] SF.net SVN: xoops-svn:[10242] XoopsCore/branches/2.6.x/2.6.0/htdocs

[<du...@us...>]

Revision: 10242
          http://sourceforge.net/p/xoops/svn/10242
Author:   dugris
Date:     2012-10-29 18:30:48 +0000 (Mon, 29 Oct 2012)
Log Message:
-----------
modify to use a custom file : xoops.bootstrap.css

Modified Paths:
--------------
    XoopsCore/branches/2.6.x/2.6.0/htdocs/mainfile.php
    XoopsCore/branches/2.6.x/2.6.0/htdocs/media/bootstrap/css/xoops.bootstrap.css
    XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/templates/system_siteclosed.html
    XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/themes/default/default.php
    XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/themes/default/xotpl/head.html
    XoopsCore/branches/2.6.x/2.6.0/htdocs/themes/default/xotpl/theme_head.html

Added Paths:
-----------
    XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/themes/default/media/
    XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/themes/default/media/bootstrap/
    XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/themes/default/media/bootstrap/css/
    XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/themes/default/media/bootstrap/css/xoops.bootstrap.css
    XoopsCore/branches/2.6.x/2.6.0/htdocs/themes/default/media/
    XoopsCore/branches/2.6.x/2.6.0/htdocs/themes/default/media/bootstrap/
    XoopsCore/branches/2.6.x/2.6.0/htdocs/themes/default/media/bootstrap/css/
    XoopsCore/branches/2.6.x/2.6.0/htdocs/themes/default/media/bootstrap/css/xoops.bootstrap.css

Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/mainfile.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/mainfile.php	2012-10-28 14:29:31 UTC (rev 10241)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/mainfile.php	2012-10-29 18:30:48 UTC (rev 10242)
@@ -17,6 +17,65 @@
  * @version     $Id$
  */
 
-if (! defined('XOOPS_INSTALL')) {
-    header('Location: install/index.php');
+if (!defined("XOOPS_MAINFILE_INCLUDED")) {
+    define("XOOPS_MAINFILE_INCLUDED", 1);
+
+    // XOOPS Physical Paths
+
+    // Physical path to the XOOPS documents (served) directory WITHOUT trailing slash
+    define('XOOPS_ROOT_PATH', 'C:/Internet/Xoops/Xoops_2.6.0/htdocs');
+
+    // For forward compatibility
+    // Physical path to the XOOPS library directory WITHOUT trailing slash
+    define('XOOPS_PATH', 'C:/Internet/Xoops/Xoops_2.6.0/htdocs/xoops_lib');
+    // Physical path to the XOOPS datafiles (writable) directory WITHOUT trailing slash
+    define('XOOPS_VAR_PATH', 'C:/Internet/Xoops/Xoops_2.6.0/htdocs/xoops_data');
+    // Alias of XOOPS_PATH, for compatibility, temporary solution
+    define("XOOPS_TRUST_PATH", XOOPS_PATH);
+
+    // URL Association for SSL and Protocol Compatibility
+    $http = 'http://';
+    if (!empty($_SERVER['HTTPS'])) {
+        $http = ($_SERVER['HTTPS']=='on') ? 'https://' : 'http://';
+    }
+    define('XOOPS_PROT', $http);
+
+    // XOOPS Virtual Path (URL)
+    // Virtual path to your main XOOPS directory WITHOUT trailing slash
+    // Example: define('XOOPS_URL', 'http://dugris.no-ip.org/Xoops/Xoops_2.6.0/htdocs');
+    define('XOOPS_URL', 'http://dugris.no-ip.org:8090');
+
+    // Shall be handled later, don't forget!
+    define("XOOPS_CHECK_PATH", 0);
+    // Protect against external scripts execution if safe mode is not enabled
+    if (XOOPS_CHECK_PATH && !@ini_get("safe_mode")) {
+        if (function_exists("debug_backtrace")) {
+            $xoopsScriptPath = debug_backtrace();
+            if (!count($xoopsScriptPath)) {
+                 die("XOOPS path check: this file cannot be requested directly");
+            }
+            $xoopsScriptPath = $xoopsScriptPath[0]["file"];
+        } else {
+            $xoopsScriptPath = isset($_SERVER["PATH_TRANSLATED"]) ? $_SERVER["PATH_TRANSLATED"] :  $_SERVER["SCRIPT_FILENAME"];
+        }
+        if (DIRECTORY_SEPARATOR != "/") {
+            // IIS6 may double the \ chars
+            $xoopsScriptPath = str_replace(strpos($xoopsScriptPath, "\\\\", 2) ? "\\\\" : DIRECTORY_SEPARATOR, "/", $xoopsScriptPath);
+        }
+        if (strcasecmp(substr($xoopsScriptPath, 0, strlen(XOOPS_ROOT_PATH)), str_replace(DIRECTORY_SEPARATOR, "/", XOOPS_ROOT_PATH))) {
+             exit("XOOPS path check: Script is not inside XOOPS_ROOT_PATH and cannot run.");
+        }
+    }
+
+    // Secure file
+    require XOOPS_VAR_PATH . '/data/secure.php';
+
+    define('XOOPS_GROUP_ADMIN', '1');
+    define('XOOPS_GROUP_USERS', '2');
+    define('XOOPS_GROUP_ANONYMOUS', '3');
+
+    if (!isset($xoopsOption["nocommon"]) && XOOPS_ROOT_PATH != "") {
+        include XOOPS_ROOT_PATH."/include/common.php";
+    }
+
 }
\ No newline at end of file

Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/media/bootstrap/css/xoops.bootstrap.css
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/media/bootstrap/css/xoops.bootstrap.css	2012-10-28 14:29:31 UTC (rev 10241)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/media/bootstrap/css/xoops.bootstrap.css	2012-10-29 18:30:48 UTC (rev 10242)
@@ -2,7 +2,6 @@
  * Adapt Bootstrap to Xoops
  * $Id$
  */
-@import url(bootstrap.min.css);
 
 /* Forms style */
 input:required, textarea:required{

Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/templates/system_siteclosed.html
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/templates/system_siteclosed.html	2012-10-28 14:29:31 UTC (rev 10241)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/templates/system_siteclosed.html	2012-10-29 18:30:48 UTC (rev 10242)
@@ -18,7 +18,8 @@
     <!-- Xoops style sheet -->
     <link rel="stylesheet" type="text/css" media="screen" href="<{xoAppUrl xoops.css}>" />
     <link rel="stylesheet" type="text/css" media="screen" href="<{xoAppUrl media/xoops/css/icons.css}>" />
-    <link rel="stylesheet" type="text/css" media="screen" href="<{xoAppUrl media/bootstrap/css/xoops.bootstrap.css}>" />
+    <link rel="stylesheet" type="text/css" media="screen" href="<{xoAppUrl media/bootstrap/css/bootstrap.min.css}>" />
+    <link rel="stylesheet" type="text/css" media="screen" href="<{xoImgUrl media/bootstrap/css/xoops.bootstrap.css}>" />
 
     <!--[if lte IE 8]>
     <link rel="stylesheet" href="<{xoImgUrl styleIE8.css}>" type="text/css" />

Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/themes/default/default.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/themes/default/default.php	2012-10-28 14:29:31 UTC (rev 10241)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/themes/default/default.php	2012-10-29 18:30:48 UTC (rev 10242)
@@ -39,9 +39,7 @@
 
         $xoops->theme->addStylesheet('media/xoops/css/moduladmin.css');
         $xoops->theme->addStylesheet(XOOPS_ADMINTHEME_URL . '/default/css/style.css');
-        $xoops->theme->addStylesheet($xoops->url('/media/bootstrap/css/xoops.bootstrap.css'));
 
-
         $xoops->theme->addScript($xoops->url('/media/jquery/jquery.js'));
         $xoops->theme->addScript($xoops->url('/media/jquery/ui/jquery.ui.js'));
         $xoops->theme->addScript($xoops->url('/media/bootstrap/js/bootstrap.min.js'));


Property changes on: XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/themes/default/media
___________________________________________________________________
Added: tsvn:autoprops
   + *.php = svn:executable=*;svn:keywords=Author Date Id Rev URL;


Property changes on: XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/themes/default/media/bootstrap
___________________________________________________________________
Added: tsvn:autoprops
   + *.php = svn:executable=*;svn:keywords=Author Date Id Rev URL;


Property changes on: XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/themes/default/media/bootstrap/css
___________________________________________________________________
Added: tsvn:autoprops
   + *.php = svn:executable=*;svn:keywords=Author Date Id Rev URL;

Added: XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/themes/default/media/bootstrap/css/xoops.bootstrap.css
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/themes/default/media/bootstrap/css/xoops.bootstrap.css	                        (rev 0)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/themes/default/media/bootstrap/css/xoops.bootstrap.css	2012-10-29 18:30:48 UTC (rev 10242)
@@ -0,0 +1,94 @@
+/**
+ * Adapt Bootstrap to Xoops
+ * $Id$
+ */
+@import url(bootstrap.min.css);
+
+/* Forms style */
+input:required, textarea:required{
+    background:url(../img/required.png) right center no-repeat;
+}
+input:focus:invalid, textarea:focus:invalid{
+    background-image:none;
+}
+
+.dsc_pattern_vertical{display:none;}
+
+input:focus:invalid + span + .dsc_pattern_vertical{
+    display:block;
+    color: #b94a48;
+}
+.dsc_pattern_horizontal{display:none;}
+input:focus:invalid + .dsc_pattern_horizontal{
+    display:inline;
+    color: #b94a48;
+}
+.caption-required{color: #b94a48;}
+
+/* Area style */
+.xo-window {
+    background-color: #222222;
+    background-repeat: repeat-x;
+    background-image: -khtml-gradient(linear, left top, left bottom, from(#333333), to(#222222));
+    background-image: -moz-linear-gradient(top, #333333, #222222);
+    background-image: -ms-linear-gradient(top, #333333, #222222);
+    background-image: -webkit-gradient(linear, left top, left bottom, color-stop(0%, #333333), color-stop(100%, #222222));
+    background-image: -webkit-linear-gradient(top, #333333, #222222);
+    background-image: -o-linear-gradient(top, #333333, #222222);
+    background-image: linear-gradient(top, #333333, #222222);
+    filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#333333', endColorstr='#222222', GradientType=0);
+    -webkit-box-shadow: 0 1px 3px rgba(0, 0, 0, 0.25), inset 0 -1px 0 rgba(0, 0, 0, 0.1);
+    -moz-box-shadow: 0 1px 3px rgba(0, 0, 0, 0.25), inset 0 -1px 0 rgba(0, 0, 0, 0.1);
+    box-shadow: 0 1px 3px rgba(0, 0, 0, 0.25), inset 0 -1px 0 rgba(0, 0, 0, 0.1);
+    -moz-border-radius: 5px 5px 0 0;
+    -khtml-border-top-left-radius: 5px;
+    -khtml-border-top-right-radius: 5px;
+    -webkit-border-radius-topleft: 5px;
+    -webkit-border-radius-topright: 5px;
+    border-radius: 5px 5px 0 0;
+    border: 1px solid #2D4760;
+    padding: 4px 6px 6px 4px;
+    height: 20px;
+}
+.xo-window-title {
+    padding: 2px 6px 6px 6px;
+    color: #fff;
+    font-weight: bold;
+    text-shadow: 0 0 2px #000;
+    font-family: tahoma, verdana, arial, sans-serif;
+}
+.xo-window-data {
+    float: left;
+    min-height: 50px;
+    padding: 6px;
+    width: 100%;
+}
+
+.clear {
+    clear: both;
+}
+.spacer .spacer-mini {
+    padding:0 0 3px 0;
+}
+.spacer-mid {
+    padding:0 0 6px 0;
+}
+.spacer-large {
+    padding:0 0 12px 0;
+}
+
+.txt-center { text-align: center; }
+
+.form-horizontal .control-label {
+  float: left;
+  width: 250px;
+  padding-top: 5px;
+  text-align: right;
+}
+
+.form-horizontal .controls {
+  *display: inline-block;
+  *padding-left: 20px;
+  margin-left: 270px;
+  *margin-left: 0;
+}

Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/themes/default/xotpl/head.html
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/themes/default/xotpl/head.html	2012-10-28 14:29:31 UTC (rev 10241)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/modules/system/themes/default/xotpl/head.html	2012-10-29 18:30:48 UTC (rev 10242)
@@ -20,6 +20,9 @@
 <!-- Xoops style sheet -->
 <link rel="stylesheet" type="text/css" media="screen" href="<{xoAppUrl xoops.css}>" />
 <link rel="stylesheet" type="text/css" media="screen" href="<{xoAppUrl media/xoops/css/icons.css}>" />
+<link rel="stylesheet" type="text/css" media="screen" href="<{xoAppUrl media/bootstrap/css/bootstrap.min.css}>" />
+<link rel="stylesheet" type="text/css" media="screen" href="<{xoImgUrl media/bootstrap/css/xoops.bootstrap.css}>" />
+
 <!-- Le HTML5 shim, for IE6-8 support of HTML5 elements -->
 <!--[if lt IE 9]>
 <script src="http://html5shim.googlecode.com/svn/trunk/html5.js"></script>


Property changes on: XoopsCore/branches/2.6.x/2.6.0/htdocs/themes/default/media
___________________________________________________________________
Added: tsvn:autoprops
   + *.php = svn:executable=*;svn:keywords=Author Date Id Rev URL;


Property changes on: XoopsCore/branches/2.6.x/2.6.0/htdocs/themes/default/media/bootstrap
___________________________________________________________________
Added: tsvn:autoprops
   + *.php = svn:executable=*;svn:keywords=Author Date Id Rev URL;


Property changes on: XoopsCore/branches/2.6.x/2.6.0/htdocs/themes/default/media/bootstrap/css
___________________________________________________________________
Added: tsvn:autoprops
   + *.php = svn:executable=*;svn:keywords=Author Date Id Rev URL;

Added: XoopsCore/branches/2.6.x/2.6.0/htdocs/themes/default/media/bootstrap/css/xoops.bootstrap.css
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/themes/default/media/bootstrap/css/xoops.bootstrap.css	                        (rev 0)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/themes/default/media/bootstrap/css/xoops.bootstrap.css	2012-10-29 18:30:48 UTC (rev 10242)
@@ -0,0 +1,94 @@
+/**
+ * Adapt Bootstrap to Xoops
+ * $Id$
+ */
+@import url(bootstrap.min.css);
+
+/* Forms style */
+input:required, textarea:required{
+    background:url(../img/required.png) right center no-repeat;
+}
+input:focus:invalid, textarea:focus:invalid{
+    background-image:none;
+}
+
+.dsc_pattern_vertical{display:none;}
+
+input:focus:invalid + span + .dsc_pattern_vertical{
+    display:block;
+    color: #b94a48;
+}
+.dsc_pattern_horizontal{display:none;}
+input:focus:invalid + .dsc_pattern_horizontal{
+    display:inline;
+    color: #b94a48;
+}
+.caption-required{color: #b94a48;}
+
+/* Area style */
+.xo-window {
+    background-color: #222222;
+    background-repeat: repeat-x;
+    background-image: -khtml-gradient(linear, left top, left bottom, from(#333333), to(#222222));
+    background-image: -moz-linear-gradient(top, #333333, #222222);
+    background-image: -ms-linear-gradient(top, #333333, #222222);
+    background-image: -webkit-gradient(linear, left top, left bottom, color-stop(0%, #333333), color-stop(100%, #222222));
+    background-image: -webkit-linear-gradient(top, #333333, #222222);
+    background-image: -o-linear-gradient(top, #333333, #222222);
+    background-image: linear-gradient(top, #333333, #222222);
+    filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#333333', endColorstr='#222222', GradientType=0);
+    -webkit-box-shadow: 0 1px 3px rgba(0, 0, 0, 0.25), inset 0 -1px 0 rgba(0, 0, 0, 0.1);
+    -moz-box-shadow: 0 1px 3px rgba(0, 0, 0, 0.25), inset 0 -1px 0 rgba(0, 0, 0, 0.1);
+    box-shadow: 0 1px 3px rgba(0, 0, 0, 0.25), inset 0 -1px 0 rgba(0, 0, 0, 0.1);
+    -moz-border-radius: 5px 5px 0 0;
+    -khtml-border-top-left-radius: 5px;
+    -khtml-border-top-right-radius: 5px;
+    -webkit-border-radius-topleft: 5px;
+    -webkit-border-radius-topright: 5px;
+    border-radius: 5px 5px 0 0;
+    border: 1px solid #2D4760;
+    padding: 4px 6px 6px 4px;
+    height: 20px;
+}
+.xo-window-title {
+    padding: 2px 6px 6px 6px;
+    color: #fff;
+    font-weight: bold;
+    text-shadow: 0 0 2px #000;
+    font-family: tahoma, verdana, arial, sans-serif;
+}
+.xo-window-data {
+    float: left;
+    min-height: 50px;
+    padding: 6px;
+    width: 100%;
+}
+
+.clear {
+    clear: both;
+}
+.spacer .spacer-mini {
+    padding:0 0 3px 0;
+}
+.spacer-mid {
+    padding:0 0 6px 0;
+}
+.spacer-large {
+    padding:0 0 12px 0;
+}
+
+.txt-center { text-align: center; }
+
+.form-horizontal .control-label {
+  float: left;
+  width: 250px;
+  padding-top: 5px;
+  text-align: right;
+}
+
+.form-horizontal .controls {
+  *display: inline-block;
+  *padding-left: 20px;
+  margin-left: 270px;
+  *margin-left: 0;
+}

Modified: XoopsCore/branches/2.6.x/2.6.0/htdocs/themes/default/xotpl/theme_head.html
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0/htdocs/themes/default/xotpl/theme_head.html	2012-10-28 14:29:31 UTC (rev 10241)
+++ XoopsCore/branches/2.6.x/2.6.0/htdocs/themes/default/xotpl/theme_head.html	2012-10-29 18:30:48 UTC (rev 10242)
@@ -18,7 +18,8 @@
     <!-- Xoops style sheet -->
     <link rel="stylesheet" type="text/css" media="screen" href="<{xoAppUrl xoops.css}>" />
     <link rel="stylesheet" type="text/css" media="screen" href="<{xoAppUrl media/xoops/css/icons.css}>" />
-    <link rel="stylesheet" type="text/css" media="screen" href="<{xoAppUrl media/bootstrap/css/xoops.bootstrap.css}>" />
+    <link rel="stylesheet" type="text/css" media="screen" href="<{xoAppUrl media/bootstrap/css/bootstrap.min.css}>" />
+    <link rel="stylesheet" type="text/css" media="screen" href="<{xoImgUrl media/bootstrap/css/xoops.bootstrap.css}>" />
     <!--<link rel="stylesheet" type="text/css" media="screen" href="<{xoAppUrl media/bootstrap/css/bootstrap-responsive.min.css}>" />-->
     <!-- Theme style sheet -->
     <link rel="stylesheet" type="text/css" media="screen" href="<{xoImgUrl css/style.css}>" />