projects / citadel.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 6ec9db7)
Commit of files where headers or other places refering to the placing of .css files...
authorich <the_mgt@uncensored.citadel.org>
Wed, 25 Aug 2010 11:33:14 +0000 (11:33 +0000)
committerich <the_mgt@uncensored.citadel.org>
Wed, 25 Aug 2010 11:33:14 +0000 (11:33 +0000)
webcit/README.txt patch | blob | history
webcit/listsub.c patch | blob | history
webcit/static/niftycube.js patch | blob | history
webcit/static/t/head.html patch | blob | history
webcit/static/t/richedit.html patch | blob | history

diff --git a/webcit/README.txt b/webcit/README.txt
index 3879912b1e90e766e776a799dd3cb14437e3fbc6..81abefab70404988f8e374933b9fd6ca939deb0c 100644 (file)
--- a/webcit/README.txt
+++ b/webcit/README.txt
@@ -191,12 +191,12 @@ the static/ directory.  WebCit will properly serve it from there.
  -------------
 
  The default WebCit installation will create an empty directory called 
  -------------
 
  The default WebCit installation will create an empty directory called 
-"static.local".  In this directory you may place a file called "webcit.css"
-which, if present, is referenced *after* the default stylesheet.  If you
-know CSS and wish to customize your WebCit installation, any styles you
-declare in static.local/webcit.css will override the styles found in
-static/webcit.css -- and your customizations will not be overwritten when
-you upgrade WebCit later.
+"static.local". In this directory you may place a file called "webcit.css"
+into the "styles" directory which, if present, is referenced *after* the
+default stylesheet. If you know CSS and wish to customize your WebCit
+installation, any styles you declare in static.local/styles/webcit.css
+will override the styles found in static/styles/webcit.css -- and your
+customizations will not be overwritten when you upgrade WebCit later.
 
  You may also place other files, such as images, in static.local for
 further customization.
 
  You may also place other files, such as images, in static.local for
 further customization.
diff --git a/webcit/listsub.c b/webcit/listsub.c
index bd5e261829c1177ad02837fd7304feff04dffc7a..01a567bd6466fc3aa29387667126234a1affff37 100644 (file)
--- a/webcit/listsub.c
+++ b/webcit/listsub.c
@@ -1,5 +1,5 @@
 /*
 /*
- * $Id$
+ * $Id: listsub.c 8232 2010-01-14 21:46:39Z dothebart $
  *
  * Web forms for handling mailing list subscribe/unsubscribe requests.
  */
  *
  * Web forms for handling mailing list subscribe/unsubscribe requests.
  */
@@ -33,7 +33,7 @@ void do_listsub(void)
 
        wc_printf("<HTML><HEAD>\n"
                "<meta name=\"MSSmartTagsPreventParsing\" content=\"TRUE\" />\n"
 
        wc_printf("<HTML><HEAD>\n"
                "<meta name=\"MSSmartTagsPreventParsing\" content=\"TRUE\" />\n"
-               "<link href=\"static/webcit.css\" rel=\"stylesheet\" type=\"text/css\">\n"
+               "<link href=\"static/styles/webcit.css\" rel=\"stylesheet\" type=\"text/css\">\n"
                "<TITLE>\n"
        );
        wc_printf(_("List subscription"));
                "<TITLE>\n"
        );
        wc_printf(_("List subscription"));
diff --git a/webcit/static/niftycube.js b/webcit/static/niftycube.js
index 593749008eb58ae4e5ee7a15033457b74dea7cd1..06734741fa0179dd386e2bb78487267b6f30ae92 100644 (file)
--- a/webcit/static/niftycube.js
+++ b/webcit/static/niftycube.js
@@ -34,7 +34,7 @@ niftyCss=true;
 var l=CreateEl("link");
 l.setAttribute("type","text/css");
 l.setAttribute("rel","stylesheet");
 var l=CreateEl("link");
 l.setAttribute("type","text/css");
 l.setAttribute("rel","stylesheet");
-l.setAttribute("href","static/niftyCorners.css");
+l.setAttribute("href","static/styles/niftyCorners.css");
 l.setAttribute("media","screen");
 document.getElementsByTagName("head")[0].appendChild(l);
 }
 l.setAttribute("media","screen");
 document.getElementsByTagName("head")[0].appendChild(l);
 }
diff --git a/webcit/static/t/head.html b/webcit/static/t/head.html
index 1c3786fb893a464a6658bcf9662b56fbc4576c29..939dd2104031f27b206d9f68961e35b3881ff2a4 100644 (file)
--- a/webcit/static/t/head.html
+++ b/webcit/static/t/head.html
@@ -1,35 +1,34 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
         "http://www.w3.org/TR/html4/loose.dtd">
 <html>
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
         "http://www.w3.org/TR/html4/loose.dtd">
 <html>
-<head>
-<title><?CURRENT_USER> - <?SERV:HUMANNODE></title>
-<meta name="MSSmartTagsPreventParsing" content="TRUE" >
-<meta name="keywords" content="groupware messaging collaboration" >
-<link href="static/niftyCorners.css" rel="stylesheet" type="text/css">
-<link href="static/webcit.css" rel="stylesheet" type="text/css">
-<link href="static/datepicker.css" rel="stylesheet" type="text/css">
+       <head>
+               <title><?CURRENT_USER> - <?SERV:HUMANNODE></title>
+               <meta name="MSSmartTagsPreventParsing" content="TRUE" >
+               <meta name="keywords" content="groupware messaging collaboration" >
+               <link href="static/styles/niftyCorners.css" rel="stylesheet" type="text/css">
+               <link href="static/styles/webcit.css" rel="stylesheet" type="text/css">
+               <link href="static/styles/datepicker.css" rel="stylesheet" type="text/css">
 
 
-<??("COND:LOGGEDIN",1)>
-<link href="do_template?template=iconbar_user" rel="stylesheet" type="text/css">
-<link href="static/iconbaricns.css" rel="<?%("COND:ICONBAR:ACTIVE", 1, 0, #"ib_displayas", "", "alternate ")>stylesheet" type="text/css" id="style_iconbar_icns" title="Default iconbar">
-<link href="static/iconbarpiconly.css" rel="<?%("COND:ICONBAR:ACTIVE", 1, 1, #"ib_displayas", "","alternate ")>stylesheet" type="text/css" id="style_iconbar_piconly" title="Iconbar without text">
-<??("X",1)>
-
-<?CSSLOCAL> 
-<script type="text/javascript" src="static/prototype.js"></script> 
-<script type="text/javascript" src="static/scriptaculous.js"></script> 
-<script type="text/javascript" src="static/niftycube.js"></script>
-<script type="text/javascript" src="static/datepicker-dev.js"></script>
-<script type="text/javascript" src="static/wcpref.js"></script>
-<script type="text/javascript" src="static/table.js"></script>
-<script type="text/javascript" src="static/wclib.js"></script>
-<script type="text/javascript" src="static/roomops.js"></script>
-<script type="text/javascript" src="static/ctdldragdrop.js"></script>
+       <??("COND:LOGGEDIN",1)>
+               <link href="do_template?template=iconbar_user" rel="stylesheet" type="text/css">
+               <link href="static/styles/iconbaricns.css" rel="<?%("COND:ICONBAR:ACTIVE", 1, 0, #"ib_displayas", "", "alternate ")>stylesheet" type="text/css" id="style_iconbar_icns" title="Default iconbar">
+               <link href="static/styles/iconbarpiconly.css" rel="<?%("COND:ICONBAR:ACTIVE", 1, 1, #"ib_displayas", "","alternate ")>stylesheet" type="text/css" id="style_iconbar_piconly" title="Iconbar without text">
+       <??("X",1)>
+               <?CSSLOCAL> 
 
 
-</head>
+               <script type="text/javascript" src="static/prototype.js"></script> 
+               <script type="text/javascript" src="static/scriptaculous.js"></script> 
+               <script type="text/javascript" src="static/niftycube.js"></script>
+               <script type="text/javascript" src="static/datepicker-dev.js"></script>
+               <script type="text/javascript" src="static/wcpref.js"></script>
+               <script type="text/javascript" src="static/table.js"></script>
+               <script type="text/javascript" src="static/wclib.js"></script>
+               <script type="text/javascript" src="static/roomops.js"></script>
+               <script type="text/javascript" src="static/ctdldragdrop.js"></script>
+       </head>
 <body>
 <??("COND:LOGGEDIN",1)>
 <body>
 <??("COND:LOGGEDIN",1)>
-<?ICONBAR>
+       <?ICONBAR>
 <??("X",1)>
 <div id="global">
 <??("X",1)>
 <div id="global">
-<!-- end head.html -->
+<!--("end head.html")-->
diff --git a/webcit/static/t/richedit.html b/webcit/static/t/richedit.html
index bdf292ccfce9b52393934f6b2a25be2a41a98c82..75fabbdd84d904583b06c6b5cc469e932929f256 100644 (file)
--- a/webcit/static/t/richedit.html
+++ b/webcit/static/t/richedit.html
@@ -9,7 +9,7 @@ tinyMCE.init({
        theme_advanced_buttons1 : "bold, italic, underline, strikethrough, justifyleft, justifycenter, justifyright, justifyfull, blockquote, bullist, numlist, cut, copy, paste, link, image, help, forecolor, iespell, code",
        theme_advanced_buttons2 : "",
        theme_advanced_buttons3 : "",
        theme_advanced_buttons1 : "bold, italic, underline, strikethrough, justifyleft, justifycenter, justifyright, justifyfull, blockquote, bullist, numlist, cut, copy, paste, link, image, help, forecolor, iespell, code",
        theme_advanced_buttons2 : "",
        theme_advanced_buttons3 : "",
-       content_css : "static/webcit-tinymce.css",
+       content_css : "static/styles/webcit-tinymce.css",
        entity_encoding : "raw"
 });
 </script>
        entity_encoding : "raw"
 });
 </script>
Citadel server, clients, utilities