diff --git a/Rakefile b/Rakefile index f374d09..2d1afd1 100644 --- a/Rakefile +++ b/Rakefile @@ -6,8 +6,8 @@ require "stringex" # Be sure your public key is listed in your server's ~/.ssh/authorized_keys file ssh_user = "mopar@dedi.moparisthebest.com" ssh_port = "443" -document_root = "/home/mopar/htdocs/android.moparisthebest.org/" -rsync_delete = true +document_root = "/home/mopar/htdocs/moparscape.org/" +rsync_delete = false rsync_args = "" # Any extra arguments to pass to rsync deploy_default = "rsync" diff --git a/_config.yml b/_config.yml index a4fbd29..2dce5f0 100644 --- a/_config.yml +++ b/_config.yml @@ -2,9 +2,9 @@ # Main Configs # # ----------------------- # -url: //android.moparisthebest.org -title: Moparisthebest's Android Apps -subtitle: Open source Android apps that keep it simple. +url: //www.moparscape.org +title: MoparScape.org +subtitle: The mother of RS private servers author: Moparisthebest simple_search: //google.com/search description: @@ -45,7 +45,7 @@ titlecase: true # Converts page and post titles to titlecase # list each of the sidebar modules you want to include, in the order you want them to appear. # To add custom asides, create files in /source/_includes/custom/asides/ and add them to the list like 'custom/asides/custom_aside_name.html' -default_asides: [asides/recent_posts.html, asides/github.html, asides/delicious.html, asides/pinboard.html, asides/googleplus.html] +default_asides: [asides/recent_posts.html, asides/sidead.html, asides/delicious.html, asides/pinboard.html, asides/googleplus.html] # Each layout uses the default asides, but they can have their own asides instead. Simply uncomment the lines below # and add an array with the asides you want to use. @@ -85,11 +85,11 @@ delicious_user: delicious_count: 3 # Disqus Comments -disqus_short_name: moparisthebestsandroidapps +disqus_short_name: moparscape disqus_show_comment_count: true # Google Analytics -google_analytics_tracking_id: UA-6877554-3 +google_analytics_tracking_id: UA-6877554-1 # Facebook Like facebook_like: true diff --git a/rsync-exclude b/rsync-exclude index 2898a14..888b6ea 100644 --- a/rsync-exclude +++ b/rsync-exclude @@ -1,6 +1,7 @@ smf/ src/ downloads/ -echoserver.php errdocs favicon.ico +*.php +**.php diff --git a/source/_includes/article.html b/source/_includes/article.html index 2c08314..2cd4c0d 100644 --- a/source/_includes/article.html +++ b/source/_includes/article.html @@ -17,14 +17,16 @@ {% endunless %} - + {% if index %}
{{ content | excerpt }}
diff --git a/source/_includes/asides/sidead.html b/source/_includes/asides/sidead.html new file mode 100644 index 0000000..024eed1 --- /dev/null +++ b/source/_includes/asides/sidead.html @@ -0,0 +1,13 @@ +
+ + +
diff --git a/source/_includes/custom/navigation.html b/source/_includes/custom/navigation.html index b432095..4e6b1b2 100644 --- a/source/_includes/custom/navigation.html +++ b/source/_includes/custom/navigation.html @@ -2,4 +2,8 @@
  • Blog
  • Archives
  • Forums
    • +
  • Server Status
    • +
  • MoparScape 4
    • +
  • MoparScape 3
    • +
  • Download
    • diff --git a/source/_posts/2010-06-25-appbak-10.markdown b/source/_posts/2010-06-25-appbak-10.markdown deleted file mode 100644 index c13693c..0000000 --- a/source/_posts/2010-06-25-appbak-10.markdown +++ /dev/null @@ -1,40 +0,0 @@ ---- -layout: post -title: "AppBak 1.0" -date: 2010-06-25 11:07 -comments: true -categories: [AppBak, Android Apps] ---- -{% img left /images/appbak10/icon.png %} -[Version 1.0][1] - -Backup your currently installed apps to a text file, which you can use later to reinstall them from the market easily. - -You can also restore apps from the text file aTrackDog produces when you select “Export App List”. - -File selection and progress bar for backup added in 1.0. - -Code released under GNU/GPL on [GitHub][2]. - -Credits: - - * [OpenIntents][3] for the great, open source file selector I used. - * [Unhandled][4] for the awesome icon. - -Here are the screenshots that are on the market: - -{% img /images/appbak10/s1.png %} -{% img /images/appbak10/s2.png %} - - -Search for AppBak in the market or use the following QR code to install it from the market: - -[{% img /images/appbak10/qrcode.png 'QrCode link to market' 'QrCode link to market' %}][5] - -Leave comments here, or post problems in the [forums][1], thanks. - -[1]: //android.moparisthebest.org/smf/index.php/board,159.0.html -[2]: https://github.com/moparisthebest/AppBak -[3]: http://www.openintents.org/ -[4]: //www.moparisthebest.com/smf/index.php?action=profile;u=100617 -[5]: https://play.google.com/store/apps/details?id=org.moparisthebest.appbak \ No newline at end of file diff --git a/source/_posts/2013-04-23-welcome-to-our-homepage.markdown b/source/_posts/2013-04-23-welcome-to-our-homepage.markdown new file mode 100644 index 0000000..cade692 --- /dev/null +++ b/source/_posts/2013-04-23-welcome-to-our-homepage.markdown @@ -0,0 +1,21 @@ +--- +layout: post +title: "Welcome to our homepage!" +date: 2013-04-23 07:59 +comments: true +categories: [MoparScape, RSPS, RS] +author: Ruby +--- +Welcome to our new homepage! + +After much discussion, meetings and months of planning by the staff members the homepage is finally ready for release. We did consider using [WordPress][1] but WordPress comes with some complications towards our setup. Mainly because Wordpress to SMF integration is a complete pain to try and do. We eventually decided on [OctoPress][2] which is a great [Jekyll][3] based blogging software. Let us know what you think! + +We also need some help from you guys, what do you think we should feature on the homepage and blog about? We've had a few ideas floating around but nothing has been finalised yet and there's no exact criteria to be featured or what to actually feature. A good thing about OctoPress is that anyone can write a post or a blog entry by just forking [Moparisthebest's Github repository][4] add it, and put in a pull request and if Moparisthebest approves, it'll be committed and shown here! If you don't want to, or can't use github, just write another post in [this format][5] and email it to [Moparisthebest][6], though github submissions will be handled faster. I strongly suggest that if you want to take part in this, you read the [OctoPress blogging basics][7] documentation article. + +[1]: //wordpress.org +[2]: http://octopress.org +[3]: https://github.com/mojombo/jekyll +[4]: https://github.com/moparisthebest/www.moparscape.org +[5]: https://github.com/moparisthebest/www.moparscape.org/master/source/_posts/2013-04-23-welcome-to-our-homepage.markdown +[6]: mailto:admin@moparscape.org +[7]: http://octopress.org/docs/blogging/ diff --git a/source/images/appbak10/icon.png b/source/images/appbak10/icon.png deleted file mode 100644 index 24cb9c3..0000000 Binary files a/source/images/appbak10/icon.png and /dev/null differ diff --git a/source/images/appbak10/qrcode.png b/source/images/appbak10/qrcode.png deleted file mode 100644 index 5000a30..0000000 Binary files a/source/images/appbak10/qrcode.png and /dev/null differ diff --git a/source/images/appbak10/s1.png b/source/images/appbak10/s1.png deleted file mode 100644 index c303c39..0000000 Binary files a/source/images/appbak10/s1.png and /dev/null differ diff --git a/source/images/appbak10/s2.png b/source/images/appbak10/s2.png deleted file mode 100644 index a06a84f..0000000 Binary files a/source/images/appbak10/s2.png and /dev/null differ