diff --git a/sql/mysql/upgrades b/sql/mysql/upgrades
index 465d24ebc..c1c9fec33 100755
--- a/sql/mysql/upgrades
+++ b/sql/mysql/upgrades
@@ -5,49 +5,60 @@
# which is the main site (and inherts most the templates via voodoo in THEME file).
# When updating, the site_info table needs a quick update to point the site from "slashcode" to "soylentnews"
# then symlink-tool/template-tool should be run. I recommend deleting out all the templates from the database
-# as well
-#
+# as well
+TRUNCATE TABLE templates;
+
+# Remove slashcode Theme and set to new default Theme
+UPDATE site_info SET value='default' WHERE name='theme';
+
# Once deleting the theme out, and installing the new "default" theme which is a giant catch-all, add a variable
# to control the default skin
ALTER TABLE users_info ADD COLUMN skin varchar(255) DEFAULT NULL;
INSERT INTO vars (name, value, description) VALUES ('default_skin','chillax','Default skin to use in-case the user has not selected one');
+# INSERT INTO vars (name, value, description) VALUES ('default_skin','soylentnews','Default skin to use in-case the user has not selected one');
+
# New SoylentNews Slashcode updates 2014-06-01.
UPDATE vars SET value = 'slashcode_06_14' WHERE name = 'cvs_tag_currentcode';
+
# Allow submissions to have longer titles. story_text title is set to VARCHAR(100) so match here.
ALTER TABLE submissions MODIFY subj VARCHAR(100);
-# Add new voting feel
+# Add new voting field
# NOTE: this shouldn't be in users, but it makes audioguys job easy, and the schema
# is already fucking ugly as sin so ....
ALTER TABLE users ADD COLUMN willing_to_vote tinyint UNSIGNED DEFAULT 0 NOT NULL;
+
# Disable portscanning by default
INSERT INTO vars (name, value, description) VALUES ('enable_portscan','0','Enable portscanning of proxys');
+
# Setup Imporved Threaded comments
INSERT INTO commentmodes (mode, name, description) VALUES ('improvedthreaded','Impoved Threaded','');
ALTER TABLE users_comments CHANGE mode mode ENUM('flat','nested','nocomment','thread','improvedthreaded') DEFAULT 'improvedthreaded' NOT NULL;
- # Set all users on theraded or nested to improved threaded
+
+# Set all users on theraded or nested to improved threaded
UPDATE users_comments SET mode = 'improvedthreaded' WHERE mode = 'nested' OR mode = 'thread';
-# Remove slashcode Theme and set to default
-UPDATE site_info SET value='default' WHERE name='theme';
# Add in var to set if Newsletters are sent to new users by default
INSERT INTO vars (name, value, description) VALUES ('newsletter_by_default','0','Turn on newsletter sending by default for new users. 0 = off | 1 = on');
+
# Update for longer nicknames
UPDATE vars SET value = '35' WHERE name = 'nick_maxlen';
UPDATE vars SET value = '^[a-zA-Z_][ a-zA-Z0-9$_.+!*\'(),-]{0,34}$' WHERE name = 'nick_regex';
ALTER TABLE users CHANGE nickname nickname varchar(35) DEFAULT '' NOT NULL;
ALTER TABLE users CHANGE matchname matchname varchar(35);
+
# Add admin only for subscription prefs
INSERT INTO vars (name, value, description) VALUES ('subscribe_admin_only', 1, 'Subscription prefs only enabled for admins?');
+
# Remove deleted plugins
DELETE FROM site_info WHERE description LIKE '%Achievements%';
DELETE FROM site_info WHERE description LIKE '%PubKey%' or value = 'PubKey';
@@ -56,6 +67,7 @@ DELETE FROM site_info WHERE description LIKE '%Users2%' or value = 'Users2';
DELETE FROM site_info WHERE description LIKE '%FireHose%';
DELETE FROM site_info WHERE description LIKE '%Tag%';
+
# Blocks update
ALTER TABLE blocks ADD COLUMN default_block tinyint UNSIGNED DEFAULT 0 NOT NULL;
ALTER TABLE blocks ADD COLUMN hidden tinyint UNSIGNED DEFAULT 0 NOT NULL;
@@ -66,8 +78,13 @@ UPDATE blocks SET ordernum = 100 WHERE bid = 'mysite';
UPDATE blocks SET ordernum = 3 WHERE bid = 'topcomments';
UPDATE blocks SET seclev = 500 where bid = 'index_qlinks';
DELETE FROM blocks WHERE bid = 'newestthree';
- # Insert site news from old site_news template
+
+# Insert site news from old site_news template (Pull from your current site news rather than using this default if you already have it.)
INSERT INTO blocks (bid, block, seclev, type, description, skin, ordernum, title, portal, url, rdf, retrieve, default_block, always_on) VALUES ('site_news','\r\n\r\nYou should put some site news here that your users might enjoy.\r\n\r\n\r\n\r\n',500,'static',NULL,'mainpage',1,'Site News',1,NULL,NULL,0,1,1);
- # Delete slashboxes from all users
+
+# Delete slashboxes from all users
UPDATE users_index SET slashboxes = '';
+
+# Delet story_never_author for all users to fix author bug (do this each time until bug fixed)
+UPDATE users_index SET story_never_author = '';
diff --git a/themes/chillax/htdocs/chillax.cssraw b/themes/chillax/htdocs/chillax.cssraw
index 214e5e4bb..18900a5bc 100755
--- a/themes/chillax/htdocs/chillax.cssraw
+++ b/themes/chillax/htdocs/chillax.cssraw
@@ -83,8 +83,12 @@ a:hover { color: #008; }
/* Commnets Pages */
.commentTop .title {
- background: #339 linear-gradient(#006, #339);
- border-radius: 10px 10px 0 0;
+ background-color: #006;
+ background: -o-linear-gradient(#006, #339);
+ background: -webkit-linear-gradient(#006, #339);
+ background: -moz-linear-gradient(#006, #339);
+ background: linear-gradient(#006, #339);
+ border-radius: 10px 10px 0 0;
}
@@ -95,7 +99,11 @@ a:hover { color: #008; }
.commentTop .details {
border: 1px solid #aaa;
- background: #eee linear-gradient(#ccc, #eee);
+ background-color: #ccc;
+ background: -o-linear-gradient(#ccc, #eee);
+ background: -webkit-linear-gradient(#ccc, #eee);
+ background: -moz-linear-gradient(#ccc, #eee);
+ background: linear-gradient(#ccc, #eee);
color: #000;
}
@@ -184,8 +192,12 @@ a:hover { color: #008; }
/* articles */
.generaltitle div.title, .article div.title {
- background: #339 linear-gradient(#006, #339);
- border-radius: 10px 10px 0 0;
+ background-color: #006;
+ background: -o-linear-gradient(#006, #339);
+ background: -webkit-linear-gradient(#006, #339);
+ background: -moz-linear-gradient(#006, #339);
+ background: linear-gradient(#006, #339);
+ border-radius: 10px 10px 0 0;
}
#journal .article h3
@@ -199,7 +211,11 @@ a:hover { color: #008; }
font-size: .7em;
font-weight: normal;
border: 1px solid #aaa;
- background: #eee linear-gradient(#ccc, #eee);
+ background-color: #ccc;
+ background: -o-linear-gradient(#ccc, #eee);
+ background: -webkit-linear-gradient(#ccc, #eee);
+ background: -moz-linear-gradient(#ccc, #eee);
+ background: linear-gradient(#ccc, #eee);
}
.article .body
@@ -211,7 +227,11 @@ a:hover { color: #008; }
div.storylinks
{
- background: #eee linear-gradient(#ccc, #eee);
+ background-color: #ccc;
+ background: -o-linear-gradient(#ccc, #eee);
+ background: -webkit-linear-gradient(#ccc, #eee);
+ background: -moz-linear-gradient(#ccc, #eee);
+ background: linear-gradient(#ccc, #eee);
border: 1px solid #aaa;
border-top: none;
border-radius: 0 0 10px 10px;
@@ -394,7 +414,11 @@ ul.menu li.selected a, ul.menu li a:hover { color: #006; }
.message_subject
{
border: 1px solid #aaa;
- background: #eee linear-gradient(#ccc, #eee);
+ background-color: #ccc;
+ background: -o-linear-gradient(#ccc, #eee);
+ background: -webkit-linear-gradient(#ccc, #eee);
+ background: -moz-linear-gradient(#ccc, #eee);
+ background: linear-gradient(#ccc, #eee);
color: #000;
}
diff --git a/themes/default/htdocs/base.css b/themes/default/htdocs/base.css
index d72f05ef3..4139cdfae 100755
--- a/themes/default/htdocs/base.css
+++ b/themes/default/htdocs/base.css
@@ -859,11 +859,11 @@ background: #eee;
/* Authors */
-#authors .title { margin-top: 1em; }
+#authors .generalbody .title { margin-top: 1em; }
-#authors h3 { display: inline; }
+#authors .generalbody h3 { display: inline; }
-#authors h3 a { color: #fff; }
+#authors .generalbody h3 a { color: #000; }
#authors .intro
{
diff --git a/themes/default/htdocs/comments.cssraw b/themes/default/htdocs/comments.cssraw
index ca4fb5d1a..5cbe6449e 100644
--- a/themes/default/htdocs/comments.cssraw
+++ b/themes/default/htdocs/comments.cssraw
@@ -217,6 +217,7 @@ ul#commentlisting
#discussion_buttons
{
+ font-size: font-size: .75em;
padding: .3em 0;
}
diff --git a/themes/default/templates/userlogin;misc;default b/themes/default/templates/userlogin;misc;default
index e57e4f0f4..cab2d9c08 100644
--- a/themes/default/templates/userlogin;misc;default
+++ b/themes/default/templates/userlogin;misc;default
@@ -22,18 +22,20 @@ __template__
-
+
-
+
-
+