diff options
26 files changed, 24 insertions, 14 deletions
diff --git a/_includes/image.html b/_includes/image.html new file mode 100644 index 000000000..46d187982 --- /dev/null +++ b/_includes/image.html @@ -0,0 +1,4 @@ +<figure> +<img src="{{ include.url }}" alt="{{ include.description }}" width="{{ include.width }}"/> +<figcaption>{{ include.description }}</figcaption> +</figure> diff --git a/_posts/2011-07-04-asktheeu-and-informata-zyrtare-at-okcon201.markdown b/_posts/2011-07-04-asktheeu-and-informata-zyrtare-at-okcon201.markdown index 9ddd1e93d..99254aa72 100644 --- a/_posts/2011-07-04-asktheeu-and-informata-zyrtare-at-okcon201.markdown +++ b/_posts/2011-07-04-asktheeu-and-informata-zyrtare-at-okcon201.markdown @@ -20,7 +20,9 @@ tags: Last week I travelled to Berlin to meet with [@dcabo](http://twitter.com/#!/dcabo), [@helen_access](http://twitter.com/#!/helen_access) and [@KerstiRu](http://twitter.com/#!/KerstiRu) of [Access Info Europe](http://www.access-info.org/) and Valon Brestovci of [Free Libre Open Source Software Kosova](http://www.flossk.org/) (FLOSSK) to discuss and plan collaboration on the first Alaveteli-driven websites: _AskTheEu_ and _Informata Zyrtare_. -[caption id="attachment_10" align="alignleft" width="223" caption="Open hardware milling machine at OKCon"][](http://blogs.mysociety.org/alaveteliorg/files/2011/07/foamthing.jpg)[/caption] + +{% include image.html url="/assets/img/foamthing.jpg" description="Open hardware milling machine at OKCon" width="223" %} + <!-- more --> diff --git a/_posts/2011-07-13-forks-and-themes.markdown b/_posts/2011-07-13-forks-and-themes.markdown index 88cd719ad..a69ee8cb3 100644 --- a/_posts/2011-07-13-forks-and-themes.markdown +++ b/_posts/2011-07-13-forks-and-themes.markdown @@ -18,7 +18,7 @@ In non-technical terms: the team from Kosovo have been working to a tight deadli This meant they could move swiftly towards deployment; however, the down side was that they were no longer running off the same code base as WhatDoTheyKnow. As a result, they were missing out on bug fixes and improvements that mySociety were making to the code, and mySociety were missing out on things like the internationalised templates. -[caption id="attachment_17" align="alignright" width="300" caption="The current Informata Zyrtare theme"][](http://informatazyrtare.org)[/caption] +{% include image.html url="/assets/img/sq.png" description="The current Informata Zyrtare theme" width="500" %} _Merging_ is the process of taking someone else's changes and mixing them with your own changes to create a new, combined version of the software. diff --git a/_posts/2011-07-13-pret-a-porter-alaveteli.markdown b/_posts/2011-07-13-pret-a-porter-alaveteli.markdown index 4c1494453..724d7d784 100644 --- a/_posts/2011-07-13-pret-a-porter-alaveteli.markdown +++ b/_posts/2011-07-13-pret-a-porter-alaveteli.markdown @@ -16,7 +16,7 @@ As part of my recent work on the Alaveteli code, I've needed to repeatedly test It seemed a good idea while I was doing this to set up an Amazon Machine Image (AMI). This means that anyone with a correctly set up Amazon Web Services account can get a running Alaveteli server with just a few clicks. Not only does it have the core software deployed, it also comes with a web server and mail server configured, so it should in theory just work out of the box. -[caption id="attachment_22" align="alignnone" width="517" caption="Alaveteli instances running in EC2"][](http://blogs.mysociety.org/alaveteliorg/files/2011/07/ec2.png)[/caption] +{% include image.html url="/assets/img/ec2.png" description="Alaveteli instances running in EC2" width="517" %} As a nice side-effect, it means I can run the automated tests really quickly by running them on an "xlarge" EC2 instance (which is equivalent to a server with 14Gb of memory). diff --git a/_posts/2011-07-27-speeding-things-up-with-varnish.markdown b/_posts/2011-07-27-speeding-things-up-with-varnish.markdown index bdf168c09..a2bd23ab9 100644 --- a/_posts/2011-07-27-speeding-things-up-with-varnish.markdown +++ b/_posts/2011-07-27-speeding-things-up-with-varnish.markdown @@ -38,4 +38,4 @@ The moral: on all but the smallest Alaveteli website, deploy it behind a caching You can see the difference on the resource usage of the server running WhatDoTheyKnow on this chart -- I deployed the caching-related changes around 08:15 on these charts: -[](http://blogs.mysociety.org/alaveteliorg/files/2011/07/performance.png) +{% include image.html url="/assets/img/performance.png" description="Performance charts" width="700" %} diff --git a/_posts/2011-11-17-frag-den-staat-experiences-from-germany.markdown b/_posts/2011-11-17-frag-den-staat-experiences-from-germany.markdown index 256366d22..3ce26dbaf 100644 --- a/_posts/2011-11-17-frag-den-staat-experiences-from-germany.markdown +++ b/_posts/2011-11-17-frag-den-staat-experiences-from-germany.markdown @@ -12,7 +12,9 @@ categories: I recently interviewed Daniel Dietrich and Stefan Wehrmeyer of [Open Knowledge Foundation Germany](http://okfn.de). Back in August 2011 they launched [Frag den Staat](https://fragdenstaat.de/), a website inspired by [WhatDoTheyKnow](http://www.whatdotheyknow.com/). We talked about launching with media coverage and the challenges it brings, relationships with officials, and the challenges of implementing multiple jurisdictions within a single federated country. -[](http://blogs.mysociety.org/alaveteliorg/files/2011/11/fds.png)Daniel's role is as activist and troublemaker, creating connections and ensuring the site launched with lots of support. Stefan wrote the software, acted as project manager, and continues to carry out all the maintenance and development. +{% include image.html url="/assets/img/fds.png" description="Frag den Staat screenshot" width="271" %} + +Daniel's role is as activist and troublemaker, creating connections and ensuring the site launched with lots of support. Stefan wrote the software, acted as project manager, and continues to carry out all the maintenance and development. **_Seb_: How did the launch go?** diff --git a/_posts/2012-04-16-alavetelicon-community-cakes-and-black-boxes.markdown b/_posts/2012-04-16-alavetelicon-community-cakes-and-black-boxes.markdown index 6109308b2..bb66b331e 100644 --- a/_posts/2012-04-16-alavetelicon-community-cakes-and-black-boxes.markdown +++ b/_posts/2012-04-16-alavetelicon-community-cakes-and-black-boxes.markdown @@ -19,7 +19,9 @@ The [schedule was split into streams](http://www.alaveteli.org/about-2/alaveteli ## Building a movement -The main goal of the conference was to strengthen and build the community. At the time of the conference there were 7 installations of Alaveteli worldwide, but only a small amount interaction between these groups. So far, I've been the only person with a clear incentive to make sure people collaborate (I'm funded to do it!) This clearly isn't sustainable; more people need to talk directly to each other. There's no better way of building trust and understading that meeting face-to-face.[](http://blogs.mysociety.org/alaveteliorg/files/2012/02/alavetelicon.jpg) +The main goal of the conference was to strengthen and build the community. At the time of the conference there were 7 installations of Alaveteli worldwide, but only a small amount interaction between these groups. So far, I've been the only person with a clear incentive to make sure people collaborate (I'm funded to do it!) This clearly isn't sustainable; more people need to talk directly to each other. There's no better way of building trust and understading that meeting face-to-face. + +{% include image.html url="/assets/img/alavetelicon.jpg" description="Alavetelicon attendees" width="700" %} This certainly worked well for me. Of course, I had conversations with people about Freedom of Information and database architectures, but more importantly, I now know who has a new baby daughter, who is thinking about living in a co-housing project, and who loves British 80s electronic sensation _Depeche Mode_. I was really struck by what a friendly group of people this was. diff --git a/_posts/2012-06-20-new-feature-easier-request-moderation.markdown b/_posts/2012-06-20-new-feature-easier-request-moderation.markdown index aaffebeef..9e095c062 100644 --- a/_posts/2012-06-20-new-feature-easier-request-moderation.markdown +++ b/_posts/2012-06-20-new-feature-easier-request-moderation.markdown @@ -16,15 +16,15 @@ Alaveteli has always supported hiding requests that are unsuitable, but in [vers First, we allow any logged in user to report a request for moderation by an administrator. This is important because there's no way we could support the moderation of requests before they are published on the site: -[](http://blogs.mysociety.org/alaveteliorg/files/2012/06/report.png) +{% include image.html url="/assets/img/report.png" description="Reporting a request" width="651" %} Requests that have been reported now appear in a worklist on the home page of Alaveteli's administrative interface: - +{% include image.html url="/assets/img/review.png" description="Reported requests" width="504" %} When a moderator clicks through to the edit page for the request, they are now presented with radio buttons to select a reason why the request should be hidden (if any). A text box appears prefilled with suggested text, and when the moderator hits the "hide request" button, this message is emailed to the requestor notifying them that their message has been hidden: - +{% include image.html url="/assets/img/hide.png" description="Interface for hiding a request" width="635" %} Let us know if you find this useful, and if you think it needs any more tweaking! diff --git a/_posts/2012-06-20-the-new-bootstrap-admin-theme.markdown b/_posts/2012-06-20-the-new-bootstrap-admin-theme.markdown index ee491efe6..0feac3e78 100644 --- a/_posts/2012-06-20-the-new-bootstrap-admin-theme.markdown +++ b/_posts/2012-06-20-the-new-bootstrap-admin-theme.markdown @@ -12,7 +12,7 @@ categories: One of the major new features in the latest release of Alaveteli is a more attractive (and hopefully more usable) admin theme. Here's a before-and-after shot of the home page: -[](http://blogs.mysociety.org/alaveteliorg/files/2012/06/oldnew.png) +{% include image.html url="/assets/img/oldnew.png" description="Admin interface before and after" width="643" %} The theme was started at AlaveteliCon by [@wombleton](https://twitter.com/#!/wombleton). It's based on Twitter's [Bootstrap framework](http://twitter.github.com/bootstrap/), a CSS-and-javascript foundation for layout and styling of websites. It tries to collapse the large amounts of data often found on a single page into smaller chunks that can be scanned more easily. diff --git a/_posts/2012-06-21-new-feature-following-and-the-wall.markdown b/_posts/2012-06-21-new-feature-following-and-the-wall.markdown index 0a03a5ddd..ce70efad5 100644 --- a/_posts/2012-06-21-new-feature-following-and-the-wall.markdown +++ b/_posts/2012-06-21-new-feature-following-and-the-wall.markdown @@ -14,8 +14,8 @@ You've always been able to subscribe to email alerts about requests. However, Here's the _"Follow"_ button: -[](http://blogs.mysociety.org/alaveteliorg/files/2012/06/boring.png) +{% include image.html url="/assets/img/boring.png" description="Following a request" width="658" %} ...and here's the "wall": - +{% include image.html url="/assets/img/wall.png" description="the new 'wall' in alaveteli" width="658" %} diff --git a/_posts/2013-06-12-454.markdown b/_posts/2013-06-12-454.markdown index bc2cd9106..1c2071048 100644 --- a/_posts/2013-06-12-454.markdown +++ b/_posts/2013-06-12-454.markdown @@ -10,7 +10,7 @@ categories: - Development --- -[](http://www.flickr.com/photos/sashimanek/2319053387/) +{% include image.html url="/assets/img/2319053387_eb231d4a60_z.jpg" description="Brass Band Serenade by .sashi - http://www.flickr.com/photos/sashimanek/2319053387/" width="658" %} Today, we are using the phrase "Alaveteli upgrade" rather a lot - and not just because it's such a great tongue-twister. It's also a notable milestone for our open-source community. diff --git a/assets/img/2319053387_eb231d4a60_z.jpg b/assets/img/2319053387_eb231d4a60_z.jpg Binary files differnew file mode 100644 index 000000000..e8dd175da --- /dev/null +++ b/assets/img/2319053387_eb231d4a60_z.jpg diff --git a/assets/img/alavetelicon.jpg b/assets/img/alavetelicon.jpg Binary files differnew file mode 100644 index 000000000..c56aa015c --- /dev/null +++ b/assets/img/alavetelicon.jpg diff --git a/assets/img/boring.png b/assets/img/boring.png Binary files differnew file mode 100644 index 000000000..b346eba37 --- /dev/null +++ b/assets/img/boring.png diff --git a/assets/img/ec2.png b/assets/img/ec2.png Binary files differnew file mode 100644 index 000000000..f9c9fe0df --- /dev/null +++ b/assets/img/ec2.png diff --git a/assets/img/fds.png b/assets/img/fds.png Binary files differnew file mode 100644 index 000000000..56c629a16 --- /dev/null +++ b/assets/img/fds.png diff --git a/assets/img/foamthing.jpg b/assets/img/foamthing.jpg Binary files differnew file mode 100644 index 000000000..de7985aed --- /dev/null +++ b/assets/img/foamthing.jpg diff --git a/assets/img/hide.png b/assets/img/hide.png Binary files differnew file mode 100644 index 000000000..467bbaadc --- /dev/null +++ b/assets/img/hide.png diff --git a/assets/img/oldnew.png b/assets/img/oldnew.png Binary files differnew file mode 100644 index 000000000..46c5ccbdb --- /dev/null +++ b/assets/img/oldnew.png diff --git a/assets/img/performance.png b/assets/img/performance.png Binary files differnew file mode 100644 index 000000000..f90bc1167 --- /dev/null +++ b/assets/img/performance.png diff --git a/images/railsmodels.png b/assets/img/railsmodels.png Binary files differindex db9e37d61..db9e37d61 100644 --- a/images/railsmodels.png +++ b/assets/img/railsmodels.png diff --git a/assets/img/report.png b/assets/img/report.png Binary files differnew file mode 100644 index 000000000..020251169 --- /dev/null +++ b/assets/img/report.png diff --git a/assets/img/review.png b/assets/img/review.png Binary files differnew file mode 100644 index 000000000..2144744f2 --- /dev/null +++ b/assets/img/review.png diff --git a/assets/img/sq.png b/assets/img/sq.png Binary files differnew file mode 100644 index 000000000..a90f332d9 --- /dev/null +++ b/assets/img/sq.png diff --git a/assets/img/wall.png b/assets/img/wall.png Binary files differnew file mode 100644 index 000000000..185cc86f5 --- /dev/null +++ b/assets/img/wall.png diff --git a/docs/developers/overview.md b/docs/developers/overview.md index ca2d27985..8193528ce 100644 --- a/docs/developers/overview.md +++ b/docs/developers/overview.md @@ -43,7 +43,7 @@ ensure they have an envelope-from header set (to combat spam). ## Schema diagram -<a name="schema-diagram" href="{{ site.baseurl }}images/railsmodels.png"><img src="{{ site.baseurl }}images/railsmodels.png"></a> +<a name="schema-diagram" href="{{ site.baseurl }}assets/img/railsmodels.png"><img src="{{ site.baseurl }}assets/img/railsmodels.png"></a> This schema for the Rails models was generated from the code on 19 Dec 2012 using [Railroad](http://railroad.rubyforge.org/). |
