From 0e84b4b269ad2f0ff26b46f47b0a1ceecea9f819 Mon Sep 17 00:00:00 2001
From: Massimo Di Pierro <mdipierro@OfficeMacPro.local>
Date: Fri, 24 Aug 2012 09:53:57 -0500
Subject: [PATCH] renamed bootswatch*.css as web2py_bootstrap*.css

---
 VERSION                                                     | 2 +-
 .../static/css/{bootswatch.css => web2py_bootstrap.css}     | 0
 .../css/{bootswatch_nojs.css => web2py_bootstrap_nojs.css}  | 0
 applications/welcome/views/layout.html                      | 6 +++---
 4 files changed, 4 insertions(+), 4 deletions(-)
 rename applications/welcome/static/css/{bootswatch.css => web2py_bootstrap.css} (100%)
 rename applications/welcome/static/css/{bootswatch_nojs.css => web2py_bootstrap_nojs.css} (100%)

diff --git a/VERSION b/VERSION
index f5f172a6..d1747118 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-Version 2.00.0 (2012-08-24 09:43:38) dev
+Version 2.00.0 (2012-08-24 09:53:17) dev
diff --git a/applications/welcome/static/css/bootswatch.css b/applications/welcome/static/css/web2py_bootstrap.css
similarity index 100%
rename from applications/welcome/static/css/bootswatch.css
rename to applications/welcome/static/css/web2py_bootstrap.css
diff --git a/applications/welcome/static/css/bootswatch_nojs.css b/applications/welcome/static/css/web2py_bootstrap_nojs.css
similarity index 100%
rename from applications/welcome/static/css/bootswatch_nojs.css
rename to applications/welcome/static/css/web2py_bootstrap_nojs.css
diff --git a/applications/welcome/views/layout.html b/applications/welcome/views/layout.html
index 9fa54881..c072d804 100644
--- a/applications/welcome/views/layout.html
+++ b/applications/welcome/views/layout.html
@@ -43,11 +43,11 @@
   response.files.append(URL('static','css/bootstrap.min.css'))
   response.files.append(URL('static','css/bootstrap-responsive.min.css'))
   response.files.append(URL('static','css/web2py.css'))
-  response.files.append(URL('static','css/bootswatch.css'))
+  response.files.append(URL('static','css/web2py_bootsrap.css'))
   }}
   <!-- Makes bootswatch working on IE 7/8 -->
   <!--[if (lt IE 9)]>
-  <link rel="stylesheet" href="{{=URL('static','css/bootswatch_ie.css')}}">
+  <link rel="stylesheet" href="{{=URL('static','css/web2py_bootstrap_ie.css')}}">
   <![endif]-->
 
   {{include 'web2py_ajax.html'}}
@@ -64,7 +64,7 @@
        <link rel="stylesheet" href="http://ajax.googleapis.com/ajax/libs/jqueryui/1.8.16/themes/base/jquery-ui.css" type="text/css" media="all" />
        <script src="http://ajax.googleapis.com/ajax/libs/jqueryui/1.8.16/jquery-ui.min.js" type="text/javascript"></script>
        uncomment to load jquery-ui //-->
-  <noscript><link href="{{=URL('static', 'css/bootswatch_nojs.css')}}" rel="stylesheet" type="text/css" /></noscript>
+  <noscript><link href="{{=URL('static', 'css/web2py_bootstrap_nojs.css')}}" rel="stylesheet" type="text/css" /></noscript>
   {{block head}}{{end}}
 </head>