Skip to content

Commit

Permalink
Merge pull request #206 from paulej72/master
Browse files Browse the repository at this point in the history 
Bug fixes for upcoming 14.06 release.
  • Loading branch information
@paulej72
paulej72 committed May 28, 2014
2 parents 4ff3bc9 + d75cd41 commit 3f2661e
Show file tree
Hide file tree
Showing 7 changed files with 163 additions and 63 deletions.
33 changes: 25 additions & 8 deletions sql/mysql/upgrades
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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';
Expand All @@ -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;
Expand All @@ -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','<!-- begin site_news block -->\r\n\r\nYou should put some site news here that your users might enjoy.\r\n\r\n<!-- end quicklinks block -->\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 = '';
40 changes: 32 additions & 8 deletions themes/chillax/htdocs/chillax.cssraw
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}


Expand All @@ -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;
}

Expand Down Expand Up @@ -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
Expand All @@ -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
Expand All @@ -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;
Expand Down Expand Up @@ -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;
}

Expand Down
6 changes: 3 additions & 3 deletions themes/default/htdocs/base.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
{
Expand Down
1 change: 1 addition & 0 deletions themes/default/htdocs/comments.cssraw
View file
Original file line number Diff line number Diff line change
Expand Up @@ -217,6 +217,7 @@ ul#commentlisting

#discussion_buttons
{
font-size: font-size: .75em;
padding: .3em 0;
}

Expand Down
8 changes: 5 additions & 3 deletions themes/default/templates/userlogin;misc;default
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,18 +22,20 @@ __template__
<label>
Nickname
</label>
<input type="text" name="unickname" style="width: 18.5em;" value="" maxlength="[% constants.nick_maxlen %]">
<input type="text" name="unickname" style="width: 18em;" value="" maxlength="[% constants.nick_maxlen %]">
<label>
Password
</label>
<input type="hidden" name="returnto" value="[% return_url | strip_urlattr %]">
<input type="hidden" name="op" value="userlogin">
<input type="password" name="upasswd" style="width: 18.5em;">
<input type="password" name="upasswd" style="width: 18em;">
<label class="checkbox">
<input type="checkbox" name="login_temp" value="yes">
Public Terminal
</label>
<input type="submit" name="userlogin" value="Log In" class="button">
<div class="logout">
<input type="submit" name="userlogin" value="Log In" class="button">
</div>
</fieldset>
</form>

Expand Down
88 changes: 60 additions & 28 deletions themes/night/htdocs/night.cssraw
View file
Original file line number Diff line number Diff line change
Expand Up @@ -108,7 +108,11 @@ background: #555;
/* Commnets Pages */

.commentTop .title {
background: #933 linear-gradient(#933, #600);
background-color: #600;
background: -o-linear-gradient(#933, #600);
background: -webkit-linear-gradient(#933, #600);
background: -moz-linear-gradient(#933, #600);
background: linear-gradient(#933, #600);
border-radius: 10px 10px 0 0;
}

Expand All @@ -119,9 +123,13 @@ background: #555;
}

.commentTop .details {
border: 1px solid #aaa;
background: #333 linear-gradient(#555, #333);
color: #fff;
border: 1px solid #aaa;
background-color: #444;
background: -o-linear-gradient(#555, #333);
background: -webkit-linear-gradient(#555, #333);
background: -moz-linear-gradient(#555, #333);
background: linear-gradient(#555, #333);
color: #fff;
}

.commentTop .details a, .commentTop .details a:hover, .commentTop .details a:visited
Expand Down Expand Up @@ -216,8 +224,12 @@ border: 1px solid #aaa;
/* articles */

.generaltitle div.title, .article div.title {
background: #933 linear-gradient(#933, #600);
border-radius: 10px 10px 0 0;
background-color: #600;
background: -o-linear-gradient(#933, #600);
background: -webkit-linear-gradient(#933, #600);
background: -moz-linear-gradient(#933, #600);
background: linear-gradient(#933, #600);
border-radius: 10px 10px 0 0;
}

#journal .article h3
Expand All @@ -228,10 +240,14 @@ font-size: 1em;

.article .details
{
font-size: .7em;
font-weight: normal;
border: 1px solid #aaa;
background: #333 linear-gradient(#555, #333);
font-size: .7em;
font-weight: normal;
border: 1px solid #aaa;
background-color: #444;
background: -o-linear-gradient(#555, #333);
background: -webkit-linear-gradient(#555, #333);
background: -moz-linear-gradient(#555, #333);
background: linear-gradient(#555, #333);
}

.article .body
Expand All @@ -243,11 +259,15 @@ background: #333;

div.storylinks
{
background: #333 linear-gradient(#555, #333);
border: 1px solid #aaa;
border-top: none;
border-radius: 0 0 10px 10px;
font-size: .813em;
background-color: #444;
background: -o-linear-gradient(#555, #333);
background: -webkit-linear-gradient(#555, #333);
background: -moz-linear-gradient(#555, #333);
background: linear-gradient(#555, #333);
border: 1px solid #aaa;
border-top: none;
border-radius: 0 0 10px 10px;
font-size: .813em;
}

div.storylinks div ul
Expand Down Expand Up @@ -367,7 +387,7 @@ height: auto;
margin: 0 0 1em 0;
}


#authors .generalbody h3 a { color: #fff; }

/* Forms */
textarea { width: 80%; }
Expand Down Expand Up @@ -403,19 +423,27 @@ background:#333;
}

#usermenu ul.menu li a{
background: #933 linear-gradient(#933, #600);
border-radius: .3em .3em 0 0;
border: none;
padding: .2em .6em;
text-decoration: none;
color: #fff;
background-color: #600;
background: -o-linear-gradient(#933, #600);
background: -webkit-linear-gradient(#933, #600);
background: -moz-linear-gradient(#933, #600);
background: linear-gradient(#933, #600);
border-radius: .3em .3em 0 0;
border: none;
padding: .2em .6em;
text-decoration: none;
color: #fff;
}

#usermenu ul.menu li.selected a
{
background: #555 linear-gradient(#777, #555);
text-decoration: none;
color: #fff;
background-color: #777;
background: -o-linear-gradient(#777, #555);
background: -webkit-linear-gradient(#777, #555);
background: -moz-linear-gradient(#777, #555);
background: linear-gradient(#777, #555);
text-decoration: none;
color: #fff;
}

#adminmenu ul.menu a, #adminmenu ul.menu a:visited { color: #600; }
Expand Down Expand Up @@ -459,9 +487,13 @@ margin: 0;

.message_subject
{
border: 1px solid #aaa;
background: #333 linear-gradient(#555, #333);
color: #fff;
border: 1px solid #aaa;
background-color: #444;
background: -o-linear-gradient(#555, #333);
background: -webkit-linear-gradient(#555, #333);
background: -moz-linear-gradient(#555, #333);
background: linear-gradient(#555, #333);
color: #fff;
}

.message_body
Expand Down
Loading

0 comments on commit 3f2661e

Please sign in to comment.