zydronium/neocities
1
0
Fork 0
mirror of https://github.com/neocities/neocities.git synced 2025-04-25 01:32:36 +02:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'master' of github.com:neocities/neocities

Browse source
This commit is contained in:
Kyle Drake 2015-06-28 21:41:22 -07:00
commit 1ae265d184
7 changed files with 56 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
Gemfile.lock
View file

@ -311,6 +311,3 @@ DEPENDENCIES
timecop
webmock
zipruby
BUNDLED WITH
1.10.2

BIN
public/img/tutorialthumbnail.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 25 KiB

28
sass/_project-sass/_project-Main.scss
View file

@ -1916,9 +1916,18 @@ table#latest-visitors {
width: 100%;
}
}
.intro-List.kickstarter {
padding: 1.2em 0em 2.5em;
.intro-List.kickstarter .col {
padding-top: 1em;
padding-bottom: .8em;
margin-left: 0;
&:first-child{
padding-left: 2px;
}
.title {
margin-top: 1%;
}
.title a {
color: white;
font-weight: bold;
@ -1928,3 +1937,18 @@ table#latest-visitors {
margin-top: 15px;
}
}
.welcome.kickstarter {
background: #daeea5 url(/img/tutorialthumbnail.png) no-repeat;
background-position: right center;
background-size: auto 100%;
padding: 15px 100px 4px 23px;
margin-bottom: 13px;
font-size: 95%;
h4 {
margin-bottom: .2em;
a {
color: #2c3e50!important;
}
}
}

2
views/_header_links.erb
View file

@ -16,6 +16,6 @@
</li>
<% unless is_education? %>
<li>
<a href="/plan">Support Us<i class="fa fa-heart"><i class="fa fa-heart"></i></i></a>
<a href="https://www.kickstarter.com/projects/1262953102/neocities-30-an-interactive-html-css-course-for-ev">Support Our Kickstarter<i class="fa fa-heart"><i class="fa fa-heart"></i></i></a>
</li>
<% end %>

5
views/home.erb
View file

@ -21,6 +21,11 @@
<div class="content misc-page columns right-col">
<div class="col-left">
<div class="col col-66">
<div class="welcome kickstarter">
<h4><a href="https://www.kickstarter.com/projects/1262953102/neocities-30-an-interactive-html-css-course-for-ev">The Neocities Kickstarter: An HTML/CSS course for everyone</a></h4>
<p><strong>26 days left</strong> to get Neocities rewards and support our education goals! <a href="https://www.kickstarter.com/projects/1262953102/neocities-30-an-interactive-html-css-course-for-ev">Learn More&nbsp;>></a></p>
</div>
<% if site.site_changed == false || site.changed_count == 0 %>
<div class="welcome">
<h4>Thanks for joining the Neocities community!</h4>

22
views/index.erb
View file

@ -57,20 +57,24 @@
<div class="header-Outro">
<div class="row header-Content content">
<div class="col intro">
<h2 class="section-header">Create your own free web site.<br>Unlimited creativity, zero ads.</h2>
<h2 class="section-header">Create your own free web site. Unlimited creativity, zero ads.</h2>
<p class="intro-text">
Neocities is a community of <a href="/browse"><%= @sites_count.to_s.reverse.gsub(/...(?=.)/,'\&,').reverse %> sites</a> that are bringing back the lost individual creativity of the web. We provide free hosting and tools that allow anyone to make a web site. Only your imagination is required. Join us!
</p>
<div class="intro-List kickstarter">
<div class="title">
<a href="https://www.kickstarter.com/projects/1262953102/neocities-30-an-interactive-html-css-course-for-ev">
<img src="/img/kickstarterthumbnail.jpg" style="width: 200px; float: left; margin-right: 20px; border: 3px solid white;">
SUPPORT OUR
<img src="/img/kickstarterlogo.png" style="width: 280px; display:block; margin: 8px 0px;">
29 DAYS LEFT
</a>
<div class="col col-40">
<a href="https://www.kickstarter.com/projects/1262953102/neocities-30-an-interactive-html-css-course-for-ev"><img src="/img/kickstarterthumbnail.jpg" style="width: 100%; float: left; margin-right: 20px; border: 3px solid white;margin-bottom: 1em"></a>
</div>
<div class="col col-60">
<div class="title">
<a href="https://www.kickstarter.com/projects/1262953102/neocities-30-an-interactive-html-css-course-for-ev">
SUPPORT OUR
<img src="/img/kickstarterlogo.png" style="width: 280px; display:block; margin: 11px 0px;">
28 DAYS LEFT
</a>
</div>
<p>We need your help to build an amazing HTML/CSS course into Neocities! <a href="https://www.kickstarter.com/projects/1262953102/neocities-30-an-interactive-html-css-course-for-ev">Learn More&nbsp;>></a></p>
</div>
<p>We need your help to build an amazing HTML/CSS course into Neocities! <a href="https://www.kickstarter.com/projects/1262953102/neocities-30-an-interactive-html-css-course-for-ev">Learn More >></a></p>
</div>
<!--<ul class="intro-List">
<li class="intro-Social">

14
workers/archive_worker.rb
View file

@ -6,12 +6,20 @@ class ArchiveWorker
def perform(site_id)
site = Site[site_id]
return if site.nil? || site.is_banned?
return if site.nil? || site.is_banned? || site.is_deleted
if site.site_files_dataset.count > 1000
logger.info 'skipping #{site_id} (#{site.username}) due to > 1000 files'
return
end
queue = Sidekiq::Queue.new self.class.sidekiq_options_hash['queue']
logger.info "JOB ID: #{jid} #{site_id.inspect}"
queue.each do |job|
job.delete if job.args == [site_id] && job.jid != jid
if job.args == [site_id] && job.jid != jid
logger.info "DELETING #{job.jid} #{job.args.inspect}"
job.delete
end
end
site.archive!