Siddparmar has uploaded a new change for review. https://gerrit.wikimedia.org/r/301430
Change subject: flag borders, story image fix, user_affected table ...................................................................... flag borders, story image fix, user_affected table Change-Id: I79c967cf84ab796ec0ecce52131b94698b4f6499 --- M build/content.html M build/fr/content.html M build/fr/privacy.html M build/fr/stories.html M build/javascripts/privacy.js M build/javascripts/rag.js M build/privacy.html M build/stories.html M build/stylesheets/graph.css M build/stylesheets/master.css M locales/en.yml M source/javascripts/privacy.js M source/javascripts/rag.js M source/localizable/content.html.erb M source/localizable/privacy.html.erb M source/localizable/stories.html.erb M source/stylesheets/graph.css.scss M source/stylesheets/master.css.scss 18 files changed, 400 insertions(+), 201 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/wikimedia/TransparencyReport-private refs/changes/30/301430/1 diff --git a/build/content.html b/build/content.html index db5c2d3..7751d77 100644 --- a/build/content.html +++ b/build/content.html @@ -102,7 +102,7 @@ <div class="col-md-4"> <div class="story"> - <a href="//commons.wikimedia.org/wiki/File:PalazzoTrinci023.jpg"><img src="./images/story_dictating.jpg" ></a> + <a class='anchorImg' href="//commons.wikimedia.org/wiki/File:PalazzoTrinci023.jpg"><img src="./images/story_dictating.jpg" ></a> <h3>Dictating Content<br><small>April 2016</small></h3> <p>We occasionally receive requests from governments to remove content that those governments may find offensive—even content that is perfectly legal elsewhere. In April, we received an email from the Information and Communication Technologies Authority of the Turkish government, claiming that the Turkish Wikipedia article on Müşfik diktatörlük (benevolent dictatorship) violated Turkish law. We rejected the request, and offered to pass the message on to Turkish Wikipedia volunteers. The projects belong to the contributors, readers, and other members of the Wikimedia communities, and we believe that where possible they should decide what content belongs on the projects.</p> </div> @@ -110,7 +110,7 @@ <div class="col-md-4"> <div class="story"> - <a href="//commons.wikimedia.org/wiki/File:Whisky_(4285804207).jpg"><img src="./images/story_whisky.jpg"></a> + <a class='anchorImg' href="//commons.wikimedia.org/wiki/File:Whisky_(4285804207).jpg"><img src="./images/story_whisky.jpg"></a> <h3>Happy Hour<br><small>June 2016</small></h3> <p>Occasionally, businesses will claim that Wikipedia articles about their products are unlawful—or, in this case, “illicit”. This happened in June, when an alcoholic beverage organization emailed us, arguing that an international treaty restricted English Wikipedia editors from referring to the organization’s region-specific alcoholic beverage by a generic name. We rejected the request and informed the organization that neither trademark law nor international treaties prevent Wikimedia communities from discussing that product or similar products. We also informed them that they were welcome to work with the volunteers to discuss the proper labeling of their favored drink.</p> </div> @@ -118,7 +118,7 @@ <div class="col-md-4"> <div class="story"> - <a href="//commons.wikimedia.org/wiki/File:Zanni_mask.jpg"><img src="./images/story_zanni.jpg"></a> + <a class='anchorImg' href="//commons.wikimedia.org/wiki/File:Zanni_mask.jpg"><img src="./images/story_zanni.jpg"></a> <h3>By Any Other Name<br><small>April 2016</small></h3> <p>Sometimes, public figures are upset that Wikipedia articles contain the most basic information: for example, their name. An author with a pen name; a famous comedian who performs pseudonymously; and a musical group that uses stage names—all contacted us earlier this year to have their names removed from Wikipedia articles. Decisions about what well-sourced information should be on the projects belong to the Wikimedia communities. We directed them to the editors of Galician, English, and French Wikipedia, who can evaluate the sources provided for these names and determine whether or not to remove them.</p> </div> @@ -299,7 +299,7 @@ <div class="col-md-4"> <div class="story"> - <a href="//commons.wikimedia.org/wiki/File:Illustration_of_Bernie_Sanders.jpg"><img src="./images/story_bern.jpg"></a> + <a class='anchorImg' href="//commons.wikimedia.org/wiki/File:Illustration_of_Bernie_Sanders.jpg"><img src="./images/story_bern.jpg"></a> <h3>Feel the Bern<br><small>January 2016</small></h3> <p>In January, we received a DMCA from the campaign of Bernie Sanders, a U.S. presidential primary candidate. They asked us to remove campaign logos from Wikimedia Commons. We cautioned them that the notice would be posted to <a href='//lumendatabase.org/'>Lumen</a>, which could trigger a <ah ref='//en.wikipedia.org/wiki/Streisand_effect'>Streisand effect</a>. They refused to withdraw the DMCA, so we removed the logos. The next day, <em>Ars Technica</em> <a href='//arstechnica.com/tech-policy/2016/01/bernie-sanders-campaign-sends-dmca-notice-to-wikipedia-over-logos/'>wrote</a> about the takedown, and we received a <a href='//wikimediafoundation.org/wiki/DMCA_Policy#If_you_are_an_uploader_of_content.E2.80.A6'>counter-notice</a> from a Wikimedia user. We spoke with the Sanders campaign about the counter-notice, and were happy to hear they had decided to rescind their DMCA. The logos have been restored.</p> </div> @@ -307,7 +307,7 @@ <div class="col-md-4"> <div class="story"> - <a href="//commons.wikimedia.org/wiki/File:Red_cinema_sits_(11285613595).jpg"><img src="./images/story_cinema.jpg"></a> + <a class='anchorImg' href="//commons.wikimedia.org/wiki/File:Red_cinema_sits_(11285613595).jpg"><img src="./images/story_cinema.jpg"></a> <h3>DMCA Poster Child<br><small>February 2016</small></h3> <p>It’s not unusual to see movie posters or billboards long before a film is released, or for an upcoming movie to have a Wikipedia article written about it. Before a recent action movie hit theatres, Russian Wikipedia editors created an article about it, which included an image of one of the film’s posters. The studio behind the film contacted us in February with a DMCA notice requesting that the poster be removed from the site. However, we analyzed the request and refused it. The poster had been widely distributed to promote the movie, and it was fair use for editors to feature its image in an article informing readers about the film.</p> </div> @@ -315,7 +315,7 @@ <div class="col-md-4"> <div class="story"> - <a href="//commons.wikimedia.org/wiki/File:Newspaper_(15840560238).jpg"><img src="./images/story_newspaper.jpg"></a> + <a class='anchorImg' href="//commons.wikimedia.org/wiki/File:Newspaper_(15840560238).jpg"><img src="./images/story_newspaper.jpg"></a> <h3>Reuse Ruse<br><small>June 2016</small></h3> <p>We encourage the public to reuse Wikimedia content under our many free licenses. However, we ask that reusers respect those licenses and refrain from claiming copyright ownership of that content. This is what happened in June, when we received a DMCA notice from an Asian newspaper claiming that English Wikipedia had copied content from one of its articles. When we investigated, it turned out to be the opposite: the newspaper had copied the content from Wikipedia. We rejected the DMCA and provided a link to one of the community’s many guides on properly <a href='//en.wikipedia.org/wiki/Wikipedia:Reusing_Wikipedia_content'>reusing Wikipedia content.</a></p> </div> diff --git a/build/fr/content.html b/build/fr/content.html index 3135658..d738c24 100644 --- a/build/fr/content.html +++ b/build/fr/content.html @@ -102,7 +102,7 @@ <div class="col-md-4"> <div class="story"> - <a href="//commons.wikimedia.org/wiki/File:PalazzoTrinci023.jpg"><img src="./images/story_dictating.jpg" ></a> + <a class='anchorImg' href="//commons.wikimedia.org/wiki/File:PalazzoTrinci023.jpg"><img src="./images/story_dictating.jpg" ></a> <h3>Dictating Content<br><small>April 2016</small></h3> <p>We occasionally receive requests from governments to remove content that those governments may find offensive—even content that is perfectly legal elsewhere. In April, we received an email from the Information and Communication Technologies Authority of the Turkish government, claiming that the Turkish Wikipedia article on Müşfik diktatörlük (benevolent dictatorship) violated Turkish law. We rejected the request, and offered to pass the message on to Turkish Wikipedia volunteers. The projects belong to the contributors, readers, and other members of the Wikimedia communities, and we believe that where possible they should decide what content belongs on the projects.</p> </div> @@ -110,7 +110,7 @@ <div class="col-md-4"> <div class="story"> - <a href="//commons.wikimedia.org/wiki/File:Whisky_(4285804207).jpg"><img src="./images/story_whisky.jpg"></a> + <a class='anchorImg' href="//commons.wikimedia.org/wiki/File:Whisky_(4285804207).jpg"><img src="./images/story_whisky.jpg"></a> <h3>Happy Hour<br><small>June 2016</small></h3> <p>Occasionally, businesses will claim that Wikipedia articles about their products are unlawful—or, in this case, “illicit”. This happened in June, when an alcoholic beverage organization emailed us, arguing that an international treaty restricted English Wikipedia editors from referring to the organization’s region-specific alcoholic beverage by a generic name. We rejected the request and informed the organization that neither trademark law nor international treaties prevent Wikimedia communities from discussing that product or similar products. We also informed them that they were welcome to work with the volunteers to discuss the proper labeling of their favored drink.</p> </div> @@ -118,7 +118,7 @@ <div class="col-md-4"> <div class="story"> - <a href="//commons.wikimedia.org/wiki/File:Zanni_mask.jpg"><img src="./images/story_zanni.jpg"></a> + <a class='anchorImg' href="//commons.wikimedia.org/wiki/File:Zanni_mask.jpg"><img src="./images/story_zanni.jpg"></a> <h3>By Any Other Name<br><small>April 2016</small></h3> <p>Sometimes, public figures are upset that Wikipedia articles contain the most basic information: for example, their name. An author with a pen name; a famous comedian who performs pseudonymously; and a musical group that uses stage names—all contacted us earlier this year to have their names removed from Wikipedia articles. Decisions about what well-sourced information should be on the projects belong to the Wikimedia communities. We directed them to the editors of Galician, English, and French Wikipedia, who can evaluate the sources provided for these names and determine whether or not to remove them.</p> </div> @@ -299,7 +299,7 @@ <div class="col-md-4"> <div class="story"> - <a href="//commons.wikimedia.org/wiki/File:Illustration_of_Bernie_Sanders.jpg"><img src="./images/story_bern.jpg"></a> + <a class='anchorImg' href="//commons.wikimedia.org/wiki/File:Illustration_of_Bernie_Sanders.jpg"><img src="./images/story_bern.jpg"></a> <h3>Feel the Bern<br><small>January 2016</small></h3> <p>In January, we received a DMCA from the campaign of Bernie Sanders, a U.S. presidential primary candidate. They asked us to remove campaign logos from Wikimedia Commons. We cautioned them that the notice would be posted to <a href='//lumendatabase.org/'>Lumen</a>, which could trigger a <ah ref='//en.wikipedia.org/wiki/Streisand_effect'>Streisand effect</a>. They refused to withdraw the DMCA, so we removed the logos. The next day, <em>Ars Technica</em> <a href='//arstechnica.com/tech-policy/2016/01/bernie-sanders-campaign-sends-dmca-notice-to-wikipedia-over-logos/'>wrote</a> about the takedown, and we received a <a href='//wikimediafoundation.org/wiki/DMCA_Policy#If_you_are_an_uploader_of_content.E2.80.A6'>counter-notice</a> from a Wikimedia user. We spoke with the Sanders campaign about the counter-notice, and were happy to hear they had decided to rescind their DMCA. The logos have been restored.</p> </div> @@ -307,7 +307,7 @@ <div class="col-md-4"> <div class="story"> - <a href="//commons.wikimedia.org/wiki/File:Red_cinema_sits_(11285613595).jpg"><img src="./images/story_cinema.jpg"></a> + <a class='anchorImg' href="//commons.wikimedia.org/wiki/File:Red_cinema_sits_(11285613595).jpg"><img src="./images/story_cinema.jpg"></a> <h3>DMCA Poster Child<br><small>February 2016</small></h3> <p>It’s not unusual to see movie posters or billboards long before a film is released, or for an upcoming movie to have a Wikipedia article written about it. Before a recent action movie hit theatres, Russian Wikipedia editors created an article about it, which included an image of one of the film’s posters. The studio behind the film contacted us in February with a DMCA notice requesting that the poster be removed from the site. However, we analyzed the request and refused it. The poster had been widely distributed to promote the movie, and it was fair use for editors to feature its image in an article informing readers about the film.</p> </div> @@ -315,7 +315,7 @@ <div class="col-md-4"> <div class="story"> - <a href="//commons.wikimedia.org/wiki/File:Newspaper_(15840560238).jpg"><img src="./images/story_newspaper.jpg"></a> + <a class='anchorImg' href="//commons.wikimedia.org/wiki/File:Newspaper_(15840560238).jpg"><img src="./images/story_newspaper.jpg"></a> <h3>Reuse Ruse<br><small>June 2016</small></h3> <p>We encourage the public to reuse Wikimedia content under our many free licenses. However, we ask that reusers respect those licenses and refrain from claiming copyright ownership of that content. This is what happened in June, when we received a DMCA notice from an Asian newspaper claiming that English Wikipedia had copied content from one of its articles. When we investigated, it turned out to be the opposite: the newspaper had copied the content from Wikipedia. We rejected the DMCA and provided a link to one of the community’s many guides on properly <a href='//en.wikipedia.org/wiki/Wikipedia:Reusing_Wikipedia_content'>reusing Wikipedia content.</a></p> </div> diff --git a/build/fr/privacy.html b/build/fr/privacy.html index 1bfdf0a..6304cf7 100644 --- a/build/fr/privacy.html +++ b/build/fr/privacy.html @@ -149,48 +149,61 @@ <td>Informations fournies pour</td> <td>0</td> </tr> - <tr class="highlight"> + </table> + </div> + </div> + + <div class="col-md-6 acc_affected__wrapper"> + <div class="story"> + <h3> + <small>Janvier – Juin 2016</small><br /> + User accounts affected + </h3> + <hr /> + <table> + <tr class="indent"> <td>Comptes utilisateurs potentiellement concernés</td> <td>14</td> </tr> - <tr class="highlight"> + <tr class="indent"> <td>Comptes utilisateurs réellement concernés</td> <td>0</td> </tr> - <tr class="highlight"> - <td>User accounts Notified</td> + <tr class="indent"> + <td>User accounts notified</td> <td>0</td> </tr> </table> </div> </div> - <div class="col-md-6 info_type"> - +</div> + +<div class="col-md-12 info_type"> + + <div class="col-md-6"> <h2 class="info_type__head">Type of information requested</h2> - - <div class="col-md-6"> - <section class="scorecard"> - <h2>Janvier 2016 – Juin 2016</h2> - <dl> - <dt>Content requests</dt> - <dd>0</dd> - </dl> - </section> - </div> - - <div class="col-md-6"> - <section class="scorecard"> - <h2>Janvier 2016 – Juin 2016</h2> - <dl> - <dt>Non-content requests</dt> - <dd>13</dd> - </dl> - </section> - </div> - <p>Most content information on the Wikimedia projects is the public content of articles and project pages; “non-content” information refers to information such as <a href="https://en.wikipedia.org/wiki/IP_address">IP addresses</a> or <a href="https://en.wikipedia.org/wiki/User_agent">user agent</a> information. The distinction comes from the <a href="https://en.wikipedia.org/wiki/Electronic_Communications_Privacy_Act">Electronic Communications Privacy Act</a>, or ECPA. Please see our <a href="./faq.html">FAQ</a> for more information.</p> + </div> + <div class="col-md-3"> + <section class="scorecard"> + <h2>Janvier 2016 – Juin 2016</h2> + <dl> + <dt>Content requests</dt> + <dd>0</dd> + </dl> + </section> + </div> + + <div class="col-md-3"> + <section class="scorecard"> + <h2>Janvier 2016 – Juin 2016</h2> + <dl> + <dt>Non-content requests</dt> + <dd>13</dd> + </dl> + </section> </div> </div> diff --git a/build/fr/stories.html b/build/fr/stories.html index ca01b22..d979add 100644 --- a/build/fr/stories.html +++ b/build/fr/stories.html @@ -67,7 +67,7 @@ <div class="col-md-4"> <div class="story"> - <a href="//commons.wikimedia.org/wiki/File:PalazzoTrinci023.jpg"><img src="./images/story_dictating.jpg" ></a> + <a class='anchorImg' href="//commons.wikimedia.org/wiki/File:PalazzoTrinci023.jpg"><img src="./images/story_dictating.jpg" ></a> <h3>Dictating Content<br><small>April 2016</small></h3> <p>We occasionally receive requests from governments to remove content that those governments may find offensive—even content that is perfectly legal elsewhere. In April, we received an email from the Information and Communication Technologies Authority of the Turkish government, claiming that the Turkish Wikipedia article on Müşfik diktatörlük (benevolent dictatorship) violated Turkish law. We rejected the request, and offered to pass the message on to Turkish Wikipedia volunteers. The projects belong to the contributors, readers, and other members of the Wikimedia communities, and we believe that where possible they should decide what content belongs on the projects.</p> </div> @@ -75,7 +75,7 @@ <div class="col-md-4"> <div class="story"> - <a href="//commons.wikimedia.org/wiki/File:Whisky_(4285804207).jpg"><img src="./images/story_whisky.jpg"></a> + <a class='anchorImg' href="//commons.wikimedia.org/wiki/File:Whisky_(4285804207).jpg"><img src="./images/story_whisky.jpg"></a> <h3>Happy Hour<br><small>June 2016</small></h3> <p>Occasionally, businesses will claim that Wikipedia articles about their products are unlawful—or, in this case, “illicit”. This happened in June, when an alcoholic beverage organization emailed us, arguing that an international treaty restricted English Wikipedia editors from referring to the organization’s region-specific alcoholic beverage by a generic name. We rejected the request and informed the organization that neither trademark law nor international treaties prevent Wikimedia communities from discussing that product or similar products. We also informed them that they were welcome to work with the volunteers to discuss the proper labeling of their favored drink.</p> </div> @@ -83,7 +83,7 @@ <div class="col-md-4"> <div class="story"> - <a href="//commons.wikimedia.org/wiki/File:Zanni_mask.jpg"><img src="./images/story_zanni.jpg"></a> + <a class='anchorImg' href="//commons.wikimedia.org/wiki/File:Zanni_mask.jpg"><img src="./images/story_zanni.jpg"></a> <h3>By Any Other Name<br><small>April 2016</small></h3> <p>Sometimes, public figures are upset that Wikipedia articles contain the most basic information: for example, their name. An author with a pen name; a famous comedian who performs pseudonymously; and a musical group that uses stage names—all contacted us earlier this year to have their names removed from Wikipedia articles. Decisions about what well-sourced information should be on the projects belong to the Wikimedia communities. We directed them to the editors of Galician, English, and French Wikipedia, who can evaluate the sources provided for these names and determine whether or not to remove them.</p> </div> @@ -94,7 +94,7 @@ <div class="col-md-4"> <div class="story"> - <a href="//commons.wikimedia.org/wiki/File:Illustration_of_Bernie_Sanders.jpg"><img src="./images/story_bern.jpg"></a> + <a class='anchorImg' href="//commons.wikimedia.org/wiki/File:Illustration_of_Bernie_Sanders.jpg"><img src="./images/story_bern.jpg"></a> <h3>Feel the Bern<br><small>January 2016</small></h3> <p>In January, we received a DMCA from the campaign of Bernie Sanders, a U.S. presidential primary candidate. They asked us to remove campaign logos from Wikimedia Commons. We cautioned them that the notice would be posted to <a href='//lumendatabase.org/'>Lumen</a>, which could trigger a <ah ref='//en.wikipedia.org/wiki/Streisand_effect'>Streisand effect</a>. They refused to withdraw the DMCA, so we removed the logos. The next day, <em>Ars Technica</em> <a href='//arstechnica.com/tech-policy/2016/01/bernie-sanders-campaign-sends-dmca-notice-to-wikipedia-over-logos/'>wrote</a> about the takedown, and we received a <a href='//wikimediafoundation.org/wiki/DMCA_Policy#If_you_are_an_uploader_of_content.E2.80.A6'>counter-notice</a> from a Wikimedia user. We spoke with the Sanders campaign about the counter-notice, and were happy to hear they had decided to rescind their DMCA. The logos have been restored.</p> </div> @@ -102,7 +102,7 @@ <div class="col-md-4"> <div class="story"> - <a href="//commons.wikimedia.org/wiki/File:Red_cinema_sits_(11285613595).jpg"><img src="./images/story_cinema.jpg"></a> + <a class='anchorImg' href="//commons.wikimedia.org/wiki/File:Red_cinema_sits_(11285613595).jpg"><img src="./images/story_cinema.jpg"></a> <h3>DMCA Poster Child<br><small>February 2016</small></h3> <p>It’s not unusual to see movie posters or billboards long before a film is released, or for an upcoming movie to have a Wikipedia article written about it. Before a recent action movie hit theatres, Russian Wikipedia editors created an article about it, which included an image of one of the film’s posters. The studio behind the film contacted us in February with a DMCA notice requesting that the poster be removed from the site. However, we analyzed the request and refused it. The poster had been widely distributed to promote the movie, and it was fair use for editors to feature its image in an article informing readers about the film.</p> </div> @@ -110,7 +110,7 @@ <div class="col-md-4"> <div class="story"> - <a href="//commons.wikimedia.org/wiki/File:Newspaper_(15840560238).jpg"><img src="./images/story_newspaper.jpg"></a> + <a class='anchorImg' href="//commons.wikimedia.org/wiki/File:Newspaper_(15840560238).jpg"><img src="./images/story_newspaper.jpg"></a> <h3>Reuse Ruse<br><small>June 2016</small></h3> <p>We encourage the public to reuse Wikimedia content under our many free licenses. However, we ask that reusers respect those licenses and refrain from claiming copyright ownership of that content. This is what happened in June, when we received a DMCA notice from an Asian newspaper claiming that English Wikipedia had copied content from one of its articles. When we investigated, it turned out to be the opposite: the newspaper had copied the content from Wikipedia. We rejected the DMCA and provided a link to one of the community’s many guides on properly <a href='//en.wikipedia.org/wiki/Wikipedia:Reusing_Wikipedia_content'>reusing Wikipedia content.</a></p> </div> @@ -122,7 +122,7 @@ <!-- 2015 Stories--> <div class="col-md-4"> <div class="story"> - <a href="//commons.wikimedia.org/wiki/Category:Vulpes_vulpes#/media/File:Kew_Gardens_-_London_-_September_2008_%282958753889%29.jpg"><img src="/images/story_stock.png"></a> + <a class='anchorImg' href="//commons.wikimedia.org/wiki/Category:Vulpes_vulpes#/media/File:Kew_Gardens_-_London_-_September_2008_%282958753889%29.jpg"><img src="/images/story_stock.png"></a> <h3 id="right-way">The Right Way<br><small>March and April 2015</small></h3> <p>We carefully evaluate every DMCA notice we receive, but the job is easier when the requester provides all of the necessary information. Recently, we complied with two DMCA notices from a stock photo agency. One concerned a photo of a red fox, the other a Nepalese mountain. They also requested a third photo be removed, but as is often the case, the community noticed the improper copyright permissions and proactively removed it before we got the chance to. In each case, the agency had followed the template for DMCA requests, facilitating our review and consequently the removal of their content.</p> </div> @@ -130,7 +130,7 @@ <div class="col-md-4"> <div class="story"> - <a href="//commons.wikimedia.org/wiki/Barnstar#/media/File:Original_Barnstar_Hires.png"><img src="/images/story_barnstar.png"></a> + <a class='anchorImg' href="//commons.wikimedia.org/wiki/Barnstar#/media/File:Original_Barnstar_Hires.png"><img src="/images/story_barnstar.png"></a> <h3 id="home-made">Home-Made Barnstar<br><small>March 2015</small></h3> <p>The Wikimedia community is large and diverse, but has many things in common: for example, who doesn’t like getting a <a href='//en.wikipedia.org/wiki/Wikipedia:Barnstars'>barnstar</a> to recognize their good work on the Projects? Unfortunately, we recently received a DMCA request about one of the many barnstar images available across Wikimedia projects. Someone had uploaded a unique 'Home-Made Barnstar' from an arts and crafts site without permission to use the star. We evaluated the request, and removed the image. Don’t worry, though: you can still get a homemade barnstar. There are freely licensed barnstars, like <a href='//en.wikipedia.org/wiki/File:Homemadebarnstar.png'>this one</a>, just waiting to be discovered and awarded.</p> </div> @@ -138,7 +138,7 @@ <div class="col-md-4"> <div class="story"> - <a href="//commons.wikimedia.org/wiki/Wiki#/media/File:Chiodini_wiki.jpg"><img src="/images/story_identity.png"></a> + <a class='anchorImg' href="//commons.wikimedia.org/wiki/Wiki#/media/File:Chiodini_wiki.jpg"><img src="/images/story_identity.png"></a> <h3 id="mistaken-identity">Mistaken Identity<br><small>January, March, and May 2015</small></h3> <p>Sometimes, we get takedown requests for websites that we do not operate. In most cases, we explain to the requester that they’ve contacted the wrong party, and don’t hear from them again. But recently, a company sent us three separate DMCA requests, asking that we remove certain allegedly proprietary content from our sites. The problem? Wikimedia is not associated with any of the sites in question. The company apparently thought that all sites that include the word 'wiki' in the URL or use <a href='//www.mediawiki.org/wiki/MediaWiki'>MediaWiki software</a> are Wikimedia projects. We explained that isn't the case, but they continued to send us DMCA notices.</p> </div> @@ -149,7 +149,7 @@ <div class="col-md-4"> <div class="story"> - <a href="//commons.wikimedia.org/wiki/Category:Interiors_of_museums#/media/File:Preusser,_Karl_Louis_-_In_der_Dresdner_Galerie_-_1881.jpg"><img src="/images/story_kempler.png"></a> + <a class='anchorImg' href="//commons.wikimedia.org/wiki/Category:Interiors_of_museums#/media/File:Preusser,_Karl_Louis_-_In_der_Dresdner_Galerie_-_1881.jpg"><img src="/images/story_kempler.png"></a> <h3 id="copyrighting-facts">Copyrighting Facts<br><small>May 2015</small></h3> <p>A user contacted us to express concern about an <a href='//en.wikipedia.org/wiki/Main_Page'>English Wikipedia</a> article on a famous work of art. They wanted to remove a single sentence, on the grounds that the sentence infringed their claimed copyright in a theory they had published some years ago. We explained to them that it is impossible to copyright an idea or a short statement of fact. They could copyright their article, but not the theories contained within. If the community thought the idea was interesting or notable and complied with Wikipedia’s policies, it was free to include it in the article.</p> </div> @@ -157,7 +157,7 @@ <div class="col-md-4"> <div class="story"> - <a href="//commons.wikimedia.org/wiki/File:Screenshot_from_IMAX%C2%AE_3D_movie_Hidden_Universe_showing_the_Helix_Nebula_in_infrared.jpg"><img src="/images/story_guru.png"></a> + <a class='anchorImg' href="//commons.wikimedia.org/wiki/File:Screenshot_from_IMAX%C2%AE_3D_movie_Hidden_Universe_showing_the_Helix_Nebula_in_infrared.jpg"><img src="/images/story_guru.png"></a> <h3 id="citation-needed">Citation Needed<br><small>January 2015</small></h3> <p>A self-identified religious group wrote us, requesting that we remove multiple <a href='//en.wikipedia.org/wiki/Main_Page'>English Wikipedia</a> articles. As support for their request, they cited a self-publication declaring that the founder of their tradition is the ruler of the universe. We explained that the Wikimedia Foundation does not edit or curate content on Wikipedia, and that if they were concerned about inaccuracies, they could consult Wikipedia's experienced volunteer editors. We also directed them to Wikipedia’s <a href='//en.wikipedia.org/wiki/Wikipedia:Verifiability'>policy on verifiability</a> and <a href='//en.wikipedia.org/wiki/Wikipedia:Identifying_reliable_sources'>guide to identifying reliable sources</a>, so that they could better understand the standards applied to Wikipedia articles and permissible sources to cite in those articles.</p> </div> @@ -165,7 +165,7 @@ <div class="col-md-4"> <div class="story"> - <a href="//commons.wikimedia.org/wiki/File:TaylorFillmore.jpg"><img src="/images/story_political.png"></a> + <a class='anchorImg' href="//commons.wikimedia.org/wiki/File:TaylorFillmore.jpg"><img src="/images/story_political.png"></a> <h3 id="political-points">Political Points<br><small>March 2015</small></h3> <p>A lawyer reached out to us on behalf of a lesser-known North American political party that was unhappy with edits to <a href='//en.wikipedia.org/wiki/Main_Page'>English Wikipedia</a> articles about the party and one of its leaders. Her clients apparently wanted previous, more promotional versions of the articles restored in place of the later versions. To better engage in discussions with the community, we encouraged them to familiarize themselves with Wikipedia's <a href='https://en.wikipedia.org/wiki/Wikipedia:Writing_better_articles#Information_style_and_tone'>recommendations on style and tone</a> and the <a href='//en.wikipedia.org/wiki/Wikipedia:What_Wikipedia_is_not#Wikipedia_is_not_a_soapbox_or_means_of_promotion'>policy restricting use of promotional language</a>. We also advised that one of the best ways to resolve their concerns is to engage with the community directly.</p> </div> @@ -177,7 +177,7 @@ <!-- New Content Alteration --> <div class="col-md-4"> <div class="story"> - <a href="//commons.wikimedia.org/wiki/File:Coffee_Berries.jpg"><img src="/images/story_coffee.png"></a> + <a class='anchorImg' href="//commons.wikimedia.org/wiki/File:Coffee_Berries.jpg"><img src="/images/story_coffee.png"></a> <h3 id="grounds-for-removal">Grounds for Removal<br><small>July 2014</small></h3> <p>A nutritional supplement company requested the removal of all references to the term “coffee berries” from the <a href='//en.wikipedia.org/wiki/Main_Page'>English Wikipedia</a> article on <a href='//en.wikipedia.org/wiki/Coffee'>coffee</a>, claiming both inaccuracy and infringement of their trademark, COFFEEBERRY®. We responded that the community of editors felt that “coffee berry” was an acceptable term to refer to the fruit of the <a href='//en.wikipedia.org/wiki/Coffea'>coffee plant</a>. We also explained that trademarking a pre-existing word cannot prevent others from using the word for its original meaning. Trademark rights simply don’t give companies total control over everyday words.</p> </div> @@ -185,7 +185,7 @@ <div class="col-md-4"> <div class="story"> - <a href="//en.wikipedia.org/wiki/File:Myanmar_visa.jpg"><img src="/images/story_myanmar.png"></a> + <a class='anchorImg' href="//en.wikipedia.org/wiki/File:Myanmar_visa.jpg"><img src="/images/story_myanmar.png"></a> <h3 id="unredacted">Unredacted<br><small>August 2014</small></h3> <p>When a blogger included a photo of his visa to visit <a href='//en.wikipedia.org/wiki/Burma#Etymology'>Burma/Myanmar</a> on his website, he had scrubbed his personal details from the image. He never expected the same picture to show up on <a href='//en.wikipedia.org/wiki/Main_Page'>English Wikipedia</a> in an article about the country's visa policy -- with the redactions removed and his information exposed. He wrote to us, asking to remove the photo. Given the nature of the information and the circumstances of how it was exposed, we took the image down.</p> </div> @@ -193,7 +193,7 @@ <div class="col-md-4"> <div class="story"> - <a href="//commons.wikimedia.org/wiki/File:Poster_of_Alexander_Crystal_Seer.jpg"><img src="/images/story_seer.png"></a> + <a class='anchorImg' href="//commons.wikimedia.org/wiki/File:Poster_of_Alexander_Crystal_Seer.jpg"><img src="/images/story_seer.png"></a> <h3 id="murky-future">A Murky Future<br><small>October 2014</small></h3> <p>A law firm representing an astrologer asked that we remove a <a href='//fr.wikipedia.org/wiki/Wikip%C3%A9dia:Accueil_principal'>French Wikipedia</a> article that chronicled her history of allegedly false predictions. Unusually, they cited Wikipedia’s own <a href='//en.wikipedia.org/wiki/Wikipedia:Biographies_of_living_persons'>policy on biographies of living persons</a> as a source of the article’s problems. We explained that the Wikimedia Foundation does not write or edit Wikipedia articles. We asked that they engage with the French Wikipedia community of volunteer editors and follow Wikipedia policies to address any issues of alleged inaccuracies with the community. </p> </div> @@ -213,7 +213,7 @@ <div class="col-md-4"> <div class="story"> - <a href="//commons.wikimedia.org/wiki/File:Audio_Sound_Arts_Studio_Control_Room.jpg"><img src="/images/story_studio.png"></a> + <a class='anchorImg' href="//commons.wikimedia.org/wiki/File:Audio_Sound_Arts_Studio_Control_Room.jpg"><img src="/images/story_studio.png"></a> <h3 id="no-take-backsies">No Take Backsies<br><small>September 2014</small></h3> <p>A public relations company demanded that we remove an image of a rapper. However, the photo had been freely licensed under <a href='//commons.wikimedia.org/wiki/Main_Page'>Wikimedia Commons</a> policy apparently by the artist and claimed holder of the copyright. Therefore, we declined to remove it. The PR company initially alleged that the portrayed musician was someone different from the rapper. They later appeared to suggest that the rapper had never intended to give his permission. As the story seemed to change, the community examined, and then re-examined, the original permission. In the end the community found that the image should be kept.</p> </div> @@ -233,7 +233,7 @@ <!-- New Voluntary Disclosure --> <div class="col-md-4"> <div class="story"> - <a href="//commons.wikimedia.org/wiki/File:LED_Verkehrssicherungsbalken.jpg"><img src="/images/story_emergency.png"></a> + <a class='anchorImg' href="//commons.wikimedia.org/wiki/File:LED_Verkehrssicherungsbalken.jpg"><img src="/images/story_emergency.png"></a> <h3 id="deadly-threat">A Deadly Threat</h3> <p>The community shares threats with the Foundation when they find them. When an anonymous poster made an alleged bomb threat, we found that the edit was made from an <a href='//en.wikipedia.org/wiki/IP_address'>IP address</a> that was near the apparent threat location. As permitted by our privacy policy, we alerted local police, passing on the IP address and details we had about the threat. The police informed us they had located and arrested the person in question, who allegedly had weapons available and reportedly confessed.</p> </div> @@ -241,7 +241,7 @@ <div class="col-md-4"> <div class="story"> - <a href="//commons.wikimedia.org/wiki/White_House#mediaviewer/File:SouthPorticoChristmas.jpg"><img src="/images/story_whitehouse.png"></a> + <a class='anchorImg' href="//commons.wikimedia.org/wiki/White_House#mediaviewer/File:SouthPorticoChristmas.jpg"><img src="/images/story_whitehouse.png"></a> <h3 id="president-threats">Revealing Presidential Threats</h3> <p>On rare occasions we discover threats against public figures. This is uncommon, but something that happens on large websites. An individual had made specific, graphic threats against President <a href='//en.wikipedia.org/wiki/Barack_Obama'>Barack Obama</a>. This is contrary to our policies, and against U.S. law. In cases of potential serious harm to a person, our <a href='//wikimediafoundation.org/wiki/Privacy_policy#To_Protect_You.2C_Ourselves_.26_Others'>privacy policy</a> allows us to disclose relevant information. We immediately took action, reporting the user’s <a href='//en.wikipedia.org/wiki/IP_address'>IP address</a>, <a href='//en.wikipedia.org/wiki/User_agent'>user agent information</a>, and email address to the <a href='//en.wikipedia.org/wiki/United_States_Secret_Service'>United States Secret Service</a>.</p> </div> @@ -249,7 +249,7 @@ <div class="col-md-4"> <div class="story"> - <a href="//commons.wikimedia.org/wiki/File:Suicide_Prevention_Day.jpg"><img src="/images/story_suicide.png"></a> + <a class='anchorImg' href="//commons.wikimedia.org/wiki/File:Suicide_Prevention_Day.jpg"><img src="/images/story_suicide.png"></a> <h3 id="dealing-with-suicide">Dealing with Suicide</h3> <p> Authorities <a href='//www.afsp.org/preventing-suicide/frequently-asked-questions'>advise</a> contacting emergency services when a loved one threatens suicide. When someone shared what appeared to be a credible intent to commit suicide, we notified their local police department. The person was able to get medical help, and later let us know they were okay. If you are considering suicide, please <a href='//www.afsp.org/preventing-suicide/find-help'>seek out a mental health professional immediately</a>. You can also contact emergency services; visit an emergency room or psychiatric walk-in clinic; or call a <a href='//www.iasp.info/resources/Crisis_Centres'>suicide prevention hotline</a>.</p> </div> @@ -262,7 +262,7 @@ <!-- Old Content Alteration --> <div class="col-md-4"> <div class="story"> - <a href="//fr.wikipedia.org/wiki/Station_hertzienne_militaire_de_Pierre-sur-Haute#mediaviewer/Fichier:Base_militaire_de_Pierre-sur-Haute.jpg"><img src="/images/story_dcri.png"></a> + <a class='anchorImg' href="//fr.wikipedia.org/wiki/Station_hertzienne_militaire_de_Pierre-sur-Haute#mediaviewer/Fichier:Base_militaire_de_Pierre-sur-Haute.jpg"><img src="/images/story_dcri.png"></a> <h3 id="french-agency">Agence française de renseignement<br><small>Mars 2013</small></h3> <p>Une <a href='//fr.wikipedia.org/wiki/Direction_g%C3%A9n%C3%A9rale_de_la_S%C3%A9curit%C3%A9_int%C3%A9rieure'>agence française de renseignement</a> a convoqué un utilisateur de Wikipédia dans ses bureaux et l’a menacé de graves sanctions pénales s’il ne faisait pas usage de ses droits administratifs pour supprimer des informations sur une <a href='//fr.wikipedia.org/wiki/Station_hertzienne_militaire_de_Pierre-sur-Haute'>base militaire</a> figurant sur le <a href='//fr.wikipedia.org/wiki/Wikip%C3%A9dia:Accueil_principal'>Wikipédia français</a> qu’elle considérait comme confidentielles. Les informations soi-disant confidentielles étaient en fait accessibles publiquement car l’armée avait accordé des entretiens et permis une visite de la base à des reporters de la presse locale. Nous avons défendu l’utilisateur concerné et avons lutté pour conserver le contenu sur Wikipédia. En savoir <a href='//meta.wikimedia.org/wiki/Legal_and_Community_Advocacy/Statement_on_France'>plus</a>.</p> </div> @@ -270,7 +270,7 @@ <div class="col-md-4"> <div class="story"> - <a href="//commons.wikimedia.org/wiki/Commons:Featured_picture_candidates/File:Macaca_nigra_self-portrait_%28rotated_and_cropped%29.jpg#File:Macaca_nigra_self-portrait_.28rotated_and_cropped.29.jpg"><img src="/images/story_monkey.png"></a> + <a class='anchorImg' href="//commons.wikimedia.org/wiki/Commons:Featured_picture_candidates/File:Macaca_nigra_self-portrait_%28rotated_and_cropped%29.jpg#File:Macaca_nigra_self-portrait_.28rotated_and_cropped.29.jpg"><img src="/images/story_monkey.png"></a> <h3 id="monkey-selfie">Selfie pris par un singe<br><small>Janvier 2014</small></h3> <p>Un photographe a laissé son appareil photo sans surveillance dans un parc national dans le <a href='//fr.wikipedia.org/wiki/Sulawesi_du_Nord'>Sulawesi du Nord</a>, <a href='//fr.wikipedia.org/wiki/Indon%C3%A9sie'>en Indonésie</a>. Un <a href='//fr.wikipedia.org/wiki/Macaque_%C3%A0_cr%C3%AAte'>macaque à crête femelle noir</a> s’est saisi de l’appareil et a pris une série de photos, y compris quelques auto-portraits. Les images sont apparues dans un article d’un journal en ligne et ont finalement été postées sur <a href='//commons.wikimedia.org/wiki/Accueil'>Commons</a>. Nous avons reçu une requête de retrait de la part du photographe, qui a prétendu qu’il détenait les droits d’auteur des photographies. Nous n’étions pas de cet avis, nous avons donc refusé la requête.</p> </div> @@ -278,7 +278,7 @@ <div class="col-md-4"> <div class="story"> - <a href="//en.wikipedia.org/wiki/Mount_Wellington_%28Tasmania%29#mediaviewer/File:Mount_Wellington.jpg"><img src="/images/story_aboriginal.png"></a> + <a class='anchorImg' href="//en.wikipedia.org/wiki/Mount_Wellington_%28Tasmania%29#mediaviewer/File:Mount_Wellington.jpg"><img src="/images/story_aboriginal.png"></a> <h3 id="aboriginal">Langue aborigène<br><small>Julliet 2012</small></h3> <p>Un centre de langue aborigène de Tasmanie a exigé le retrait de l’ article <a href='//en.wikipedia.org/wiki/Main_Page'>de Wikipédia anglais</a> <a href='//en.wikipedia.org/wiki/Palawa_kani'>sur le « palawa kani »</a> en prétendant qu’il détenait les droits d’auteur sur la totalité de cette langue. Nous avons refusé de retirer l’article car la loi sur les droits d’auteur ne peut tout simplement pas être invoquée pour empêcher des personnes d’utiliser une langue tout entière ou pour empêcher qu’une discussion générale ait lieu autour de cette langue. Une réclamation d’une portée si large aurait porté atteinte à la liberté d’expression et porté un coup à la recherche, à l’éducation et au débat public, des activités que Wikimedia sert à promouvoir.</p> </div> @@ -290,7 +290,7 @@ <!-- Old DMCA --> <div class="col-md-4"> <div class="story"> - <a href="//en.wikipedia.org/wiki/Babe_Ruth%27s_called_shot#mediaviewer/File:Ruth1932-1.jpg"><img src="/images/story_ruth.png"></a> + <a class='anchorImg' href="//en.wikipedia.org/wiki/Babe_Ruth%27s_called_shot#mediaviewer/File:Ruth1932-1.jpg"><img src="/images/story_ruth.png"></a> <h3 id="babe-ruth"> Le Coup annoncé de Babe Ruth Shot<br><small>Mars 2014</small> </h3> @@ -310,7 +310,7 @@ <div class="col-md-4"> <div class="story"> - <a href="//commons.wikimedia.org/wiki/Jane_Austen#mediaviewer/File:Jane_Austen_coloured_version.jpg"><img src="/images/story_classics.png"></a> + <a class='anchorImg' href="//commons.wikimedia.org/wiki/Jane_Austen#mediaviewer/File:Jane_Austen_coloured_version.jpg"><img src="/images/story_classics.png"></a> <h3 id="the-classics"> Les Classiques<br><small>Novembre 2013</small> </h3> diff --git a/build/javascripts/privacy.js b/build/javascripts/privacy.js index d03bcb5..cb30167 100644 --- a/build/javascripts/privacy.js +++ b/build/javascripts/privacy.js @@ -414,6 +414,7 @@ // If its a country graphy if ( hasFlags ) { var flags = graph.selectAll( 'image.' + className ).data( data ) + flags .enter() .append( 'image' ) @@ -426,7 +427,25 @@ dispatch.filter(); } ) .attr( 'class', className ) - .classed( 'flag', true); + .classed( 'flag', true) + .each(function(d, i) { + // add both rect and flag at same position to make it + // look like a border + if ( typeof codes[ d.key.split( '*' )[0] ] !== 'undefined' ) { + graph + .append('rect') + .attr({ + 'class': 'flagBorder', + 'width': '28', + 'height': '16', + 'y': function() { + return ( ( i + 1 ) * 40 ) - 8 + }, + 'x': '-33' + }) + } + + }) flags .on( 'mouseover', function ( d ) { diff --git a/build/javascripts/rag.js b/build/javascripts/rag.js index 0232c0b..a522713 100644 --- a/build/javascripts/rag.js +++ b/build/javascripts/rag.js @@ -250,7 +250,25 @@ .enter() .append( 'image' ) .attr( 'class', 'flags' ) - .classed( 'flag', true); + .classed( 'flag', true) + .each(function(d, i) { + // add both rect and flag at same position to make it + // look like a border + if ( typeof codes[ d.key.split( '*' )[0] ] !== 'undefined' ) { + graph + .append('rect') + .attr({ + 'class': 'flagBorder', + 'width': '28', + 'height': '16', + 'y': function() { + return ( ( i + 1 ) * 40 ) - 8 + }, + 'x': '-33' + }) + } + }) + flags .attr( 'width', 28 ) .attr( 'height', 16 ) @@ -354,7 +372,26 @@ return xScale( d.value ); } ); bar.exit().remove(); + } + function updateFlagBorder() { + + $('.flagBorder').remove() + + $('#where_from_graph .flags').each(function(i) { + if ( this.href.baseVal !== '' ) { + graph.append('rect') + .attr({ + 'class': 'flagBorder', + 'width': '28', + 'height': '16', + 'y': function() { + return ( ( i + 1 ) * 40 ) - 8 + }, + 'x': '-33' + }) + } + }) } makeGraph( data, current ); @@ -364,6 +401,7 @@ $( this ).addClass( 'active' ); var duration = $( this ).attr( 'id' ).split( '_' )[ 2 ]; makeGraph( data, duration ); + updateFlagBorder() } ); } diff --git a/build/privacy.html b/build/privacy.html index f41e32f..e9ea60a 100644 --- a/build/privacy.html +++ b/build/privacy.html @@ -149,48 +149,61 @@ <td>Information produced</td> <td>0</td> </tr> - <tr class="highlight"> + </table> + </div> + </div> + + <div class="col-md-6 acc_affected__wrapper"> + <div class="story"> + <h3> + <small>Jan – Jun 2016</small><br /> + User accounts affected + </h3> + <hr /> + <table> + <tr class="indent"> <td>User accounts potentially affected</td> <td>14</td> </tr> - <tr class="highlight"> + <tr class="indent"> <td>User accounts actually affected</td> <td>0</td> </tr> - <tr class="highlight"> - <td>User accounts Notified</td> + <tr class="indent"> + <td>User accounts notified</td> <td>0</td> </tr> </table> </div> </div> - <div class="col-md-6 info_type"> - +</div> + +<div class="col-md-12 info_type"> + + <div class="col-md-6"> <h2 class="info_type__head">Type of information requested</h2> - - <div class="col-md-6"> - <section class="scorecard"> - <h2>Jan 2016 – Jun 2016</h2> - <dl> - <dt>Content requests</dt> - <dd>0</dd> - </dl> - </section> - </div> - - <div class="col-md-6"> - <section class="scorecard"> - <h2>Jan 2016 – Jun 2016</h2> - <dl> - <dt>Non-content requests</dt> - <dd>13</dd> - </dl> - </section> - </div> - <p>Most content information on the Wikimedia projects is the public content of articles and project pages; “non-content” information refers to information such as <a href="https://en.wikipedia.org/wiki/IP_address">IP addresses</a> or <a href="https://en.wikipedia.org/wiki/User_agent">user agent</a> information. The distinction comes from the <a href="https://en.wikipedia.org/wiki/Electronic_Communications_Privacy_Act">Electronic Communications Privacy Act</a>, or ECPA. Please see our <a href="./faq.html">FAQ</a> for more information.</p> + </div> + <div class="col-md-3"> + <section class="scorecard"> + <h2>Jan 2016 – Jun 2016</h2> + <dl> + <dt>Content requests</dt> + <dd>0</dd> + </dl> + </section> + </div> + + <div class="col-md-3"> + <section class="scorecard"> + <h2>Jan 2016 – Jun 2016</h2> + <dl> + <dt>Non-content requests</dt> + <dd>13</dd> + </dl> + </section> </div> </div> diff --git a/build/stories.html b/build/stories.html index 591192e..6e37a33 100644 --- a/build/stories.html +++ b/build/stories.html @@ -67,7 +67,7 @@ <div class="col-md-4"> <div class="story"> - <a href="//commons.wikimedia.org/wiki/File:PalazzoTrinci023.jpg"><img src="./images/story_dictating.jpg" ></a> + <a class='anchorImg' href="//commons.wikimedia.org/wiki/File:PalazzoTrinci023.jpg"><img src="./images/story_dictating.jpg" ></a> <h3>Dictating Content<br><small>April 2016</small></h3> <p>We occasionally receive requests from governments to remove content that those governments may find offensive—even content that is perfectly legal elsewhere. In April, we received an email from the Information and Communication Technologies Authority of the Turkish government, claiming that the Turkish Wikipedia article on Müşfik diktatörlük (benevolent dictatorship) violated Turkish law. We rejected the request, and offered to pass the message on to Turkish Wikipedia volunteers. The projects belong to the contributors, readers, and other members of the Wikimedia communities, and we believe that where possible they should decide what content belongs on the projects.</p> </div> @@ -75,7 +75,7 @@ <div class="col-md-4"> <div class="story"> - <a href="//commons.wikimedia.org/wiki/File:Whisky_(4285804207).jpg"><img src="./images/story_whisky.jpg"></a> + <a class='anchorImg' href="//commons.wikimedia.org/wiki/File:Whisky_(4285804207).jpg"><img src="./images/story_whisky.jpg"></a> <h3>Happy Hour<br><small>June 2016</small></h3> <p>Occasionally, businesses will claim that Wikipedia articles about their products are unlawful—or, in this case, “illicit”. This happened in June, when an alcoholic beverage organization emailed us, arguing that an international treaty restricted English Wikipedia editors from referring to the organization’s region-specific alcoholic beverage by a generic name. We rejected the request and informed the organization that neither trademark law nor international treaties prevent Wikimedia communities from discussing that product or similar products. We also informed them that they were welcome to work with the volunteers to discuss the proper labeling of their favored drink.</p> </div> @@ -83,7 +83,7 @@ <div class="col-md-4"> <div class="story"> - <a href="//commons.wikimedia.org/wiki/File:Zanni_mask.jpg"><img src="./images/story_zanni.jpg"></a> + <a class='anchorImg' href="//commons.wikimedia.org/wiki/File:Zanni_mask.jpg"><img src="./images/story_zanni.jpg"></a> <h3>By Any Other Name<br><small>April 2016</small></h3> <p>Sometimes, public figures are upset that Wikipedia articles contain the most basic information: for example, their name. An author with a pen name; a famous comedian who performs pseudonymously; and a musical group that uses stage names—all contacted us earlier this year to have their names removed from Wikipedia articles. Decisions about what well-sourced information should be on the projects belong to the Wikimedia communities. We directed them to the editors of Galician, English, and French Wikipedia, who can evaluate the sources provided for these names and determine whether or not to remove them.</p> </div> @@ -94,7 +94,7 @@ <div class="col-md-4"> <div class="story"> - <a href="//commons.wikimedia.org/wiki/File:Illustration_of_Bernie_Sanders.jpg"><img src="./images/story_bern.jpg"></a> + <a class='anchorImg' href="//commons.wikimedia.org/wiki/File:Illustration_of_Bernie_Sanders.jpg"><img src="./images/story_bern.jpg"></a> <h3>Feel the Bern<br><small>January 2016</small></h3> <p>In January, we received a DMCA from the campaign of Bernie Sanders, a U.S. presidential primary candidate. They asked us to remove campaign logos from Wikimedia Commons. We cautioned them that the notice would be posted to <a href='//lumendatabase.org/'>Lumen</a>, which could trigger a <ah ref='//en.wikipedia.org/wiki/Streisand_effect'>Streisand effect</a>. They refused to withdraw the DMCA, so we removed the logos. The next day, <em>Ars Technica</em> <a href='//arstechnica.com/tech-policy/2016/01/bernie-sanders-campaign-sends-dmca-notice-to-wikipedia-over-logos/'>wrote</a> about the takedown, and we received a <a href='//wikimediafoundation.org/wiki/DMCA_Policy#If_you_are_an_uploader_of_content.E2.80.A6'>counter-notice</a> from a Wikimedia user. We spoke with the Sanders campaign about the counter-notice, and were happy to hear they had decided to rescind their DMCA. The logos have been restored.</p> </div> @@ -102,7 +102,7 @@ <div class="col-md-4"> <div class="story"> - <a href="//commons.wikimedia.org/wiki/File:Red_cinema_sits_(11285613595).jpg"><img src="./images/story_cinema.jpg"></a> + <a class='anchorImg' href="//commons.wikimedia.org/wiki/File:Red_cinema_sits_(11285613595).jpg"><img src="./images/story_cinema.jpg"></a> <h3>DMCA Poster Child<br><small>February 2016</small></h3> <p>It’s not unusual to see movie posters or billboards long before a film is released, or for an upcoming movie to have a Wikipedia article written about it. Before a recent action movie hit theatres, Russian Wikipedia editors created an article about it, which included an image of one of the film’s posters. The studio behind the film contacted us in February with a DMCA notice requesting that the poster be removed from the site. However, we analyzed the request and refused it. The poster had been widely distributed to promote the movie, and it was fair use for editors to feature its image in an article informing readers about the film.</p> </div> @@ -110,7 +110,7 @@ <div class="col-md-4"> <div class="story"> - <a href="//commons.wikimedia.org/wiki/File:Newspaper_(15840560238).jpg"><img src="./images/story_newspaper.jpg"></a> + <a class='anchorImg' href="//commons.wikimedia.org/wiki/File:Newspaper_(15840560238).jpg"><img src="./images/story_newspaper.jpg"></a> <h3>Reuse Ruse<br><small>June 2016</small></h3> <p>We encourage the public to reuse Wikimedia content under our many free licenses. However, we ask that reusers respect those licenses and refrain from claiming copyright ownership of that content. This is what happened in June, when we received a DMCA notice from an Asian newspaper claiming that English Wikipedia had copied content from one of its articles. When we investigated, it turned out to be the opposite: the newspaper had copied the content from Wikipedia. We rejected the DMCA and provided a link to one of the community’s many guides on properly <a href='//en.wikipedia.org/wiki/Wikipedia:Reusing_Wikipedia_content'>reusing Wikipedia content.</a></p> </div> @@ -122,7 +122,7 @@ <!-- 2015 Stories--> <div class="col-md-4"> <div class="story"> - <a href="//commons.wikimedia.org/wiki/Category:Vulpes_vulpes#/media/File:Kew_Gardens_-_London_-_September_2008_%282958753889%29.jpg"><img src="/images/story_stock.png"></a> + <a class='anchorImg' href="//commons.wikimedia.org/wiki/Category:Vulpes_vulpes#/media/File:Kew_Gardens_-_London_-_September_2008_%282958753889%29.jpg"><img src="/images/story_stock.png"></a> <h3 id="right-way">The Right Way<br><small>March and April 2015</small></h3> <p>We carefully evaluate every DMCA notice we receive, but the job is easier when the requester provides all of the necessary information. Recently, we complied with two DMCA notices from a stock photo agency. One concerned a photo of a red fox, the other a Nepalese mountain. They also requested a third photo be removed, but as is often the case, the community noticed the improper copyright permissions and proactively removed it before we got the chance to. In each case, the agency had followed the template for DMCA requests, facilitating our review and consequently the removal of their content.</p> </div> @@ -130,7 +130,7 @@ <div class="col-md-4"> <div class="story"> - <a href="//commons.wikimedia.org/wiki/Barnstar#/media/File:Original_Barnstar_Hires.png"><img src="/images/story_barnstar.png"></a> + <a class='anchorImg' href="//commons.wikimedia.org/wiki/Barnstar#/media/File:Original_Barnstar_Hires.png"><img src="/images/story_barnstar.png"></a> <h3 id="home-made">Home-Made Barnstar<br><small>March 2015</small></h3> <p>The Wikimedia community is large and diverse, but has many things in common: for example, who doesn’t like getting a <a href='//en.wikipedia.org/wiki/Wikipedia:Barnstars'>barnstar</a> to recognize their good work on the Projects? Unfortunately, we recently received a DMCA request about one of the many barnstar images available across Wikimedia projects. Someone had uploaded a unique 'Home-Made Barnstar' from an arts and crafts site without permission to use the star. We evaluated the request, and removed the image. Don’t worry, though: you can still get a homemade barnstar. There are freely licensed barnstars, like <a href='//en.wikipedia.org/wiki/File:Homemadebarnstar.png'>this one</a>, just waiting to be discovered and awarded.</p> </div> @@ -138,7 +138,7 @@ <div class="col-md-4"> <div class="story"> - <a href="//commons.wikimedia.org/wiki/Wiki#/media/File:Chiodini_wiki.jpg"><img src="/images/story_identity.png"></a> + <a class='anchorImg' href="//commons.wikimedia.org/wiki/Wiki#/media/File:Chiodini_wiki.jpg"><img src="/images/story_identity.png"></a> <h3 id="mistaken-identity">Mistaken Identity<br><small>January, March, and May 2015</small></h3> <p>Sometimes, we get takedown requests for websites that we do not operate. In most cases, we explain to the requester that they’ve contacted the wrong party, and don’t hear from them again. But recently, a company sent us three separate DMCA requests, asking that we remove certain allegedly proprietary content from our sites. The problem? Wikimedia is not associated with any of the sites in question. The company apparently thought that all sites that include the word 'wiki' in the URL or use <a href='//www.mediawiki.org/wiki/MediaWiki'>MediaWiki software</a> are Wikimedia projects. We explained that isn't the case, but they continued to send us DMCA notices.</p> </div> @@ -149,7 +149,7 @@ <div class="col-md-4"> <div class="story"> - <a href="//commons.wikimedia.org/wiki/Category:Interiors_of_museums#/media/File:Preusser,_Karl_Louis_-_In_der_Dresdner_Galerie_-_1881.jpg"><img src="/images/story_kempler.png"></a> + <a class='anchorImg' href="//commons.wikimedia.org/wiki/Category:Interiors_of_museums#/media/File:Preusser,_Karl_Louis_-_In_der_Dresdner_Galerie_-_1881.jpg"><img src="/images/story_kempler.png"></a> <h3 id="copyrighting-facts">Copyrighting Facts<br><small>May 2015</small></h3> <p>A user contacted us to express concern about an <a href='//en.wikipedia.org/wiki/Main_Page'>English Wikipedia</a> article on a famous work of art. They wanted to remove a single sentence, on the grounds that the sentence infringed their claimed copyright in a theory they had published some years ago. We explained to them that it is impossible to copyright an idea or a short statement of fact. They could copyright their article, but not the theories contained within. If the community thought the idea was interesting or notable and complied with Wikipedia’s policies, it was free to include it in the article.</p> </div> @@ -157,7 +157,7 @@ <div class="col-md-4"> <div class="story"> - <a href="//commons.wikimedia.org/wiki/File:Screenshot_from_IMAX%C2%AE_3D_movie_Hidden_Universe_showing_the_Helix_Nebula_in_infrared.jpg"><img src="/images/story_guru.png"></a> + <a class='anchorImg' href="//commons.wikimedia.org/wiki/File:Screenshot_from_IMAX%C2%AE_3D_movie_Hidden_Universe_showing_the_Helix_Nebula_in_infrared.jpg"><img src="/images/story_guru.png"></a> <h3 id="citation-needed">Citation Needed<br><small>January 2015</small></h3> <p>A self-identified religious group wrote us, requesting that we remove multiple <a href='//en.wikipedia.org/wiki/Main_Page'>English Wikipedia</a> articles. As support for their request, they cited a self-publication declaring that the founder of their tradition is the ruler of the universe. We explained that the Wikimedia Foundation does not edit or curate content on Wikipedia, and that if they were concerned about inaccuracies, they could consult Wikipedia's experienced volunteer editors. We also directed them to Wikipedia’s <a href='//en.wikipedia.org/wiki/Wikipedia:Verifiability'>policy on verifiability</a> and <a href='//en.wikipedia.org/wiki/Wikipedia:Identifying_reliable_sources'>guide to identifying reliable sources</a>, so that they could better understand the standards applied to Wikipedia articles and permissible sources to cite in those articles.</p> </div> @@ -165,7 +165,7 @@ <div class="col-md-4"> <div class="story"> - <a href="//commons.wikimedia.org/wiki/File:TaylorFillmore.jpg"><img src="/images/story_political.png"></a> + <a class='anchorImg' href="//commons.wikimedia.org/wiki/File:TaylorFillmore.jpg"><img src="/images/story_political.png"></a> <h3 id="political-points">Political Points<br><small>March 2015</small></h3> <p>A lawyer reached out to us on behalf of a lesser-known North American political party that was unhappy with edits to <a href='//en.wikipedia.org/wiki/Main_Page'>English Wikipedia</a> articles about the party and one of its leaders. Her clients apparently wanted previous, more promotional versions of the articles restored in place of the later versions. To better engage in discussions with the community, we encouraged them to familiarize themselves with Wikipedia's <a href='https://en.wikipedia.org/wiki/Wikipedia:Writing_better_articles#Information_style_and_tone'>recommendations on style and tone</a> and the <a href='//en.wikipedia.org/wiki/Wikipedia:What_Wikipedia_is_not#Wikipedia_is_not_a_soapbox_or_means_of_promotion'>policy restricting use of promotional language</a>. We also advised that one of the best ways to resolve their concerns is to engage with the community directly.</p> </div> @@ -177,7 +177,7 @@ <!-- New Content Alteration --> <div class="col-md-4"> <div class="story"> - <a href="//commons.wikimedia.org/wiki/File:Coffee_Berries.jpg"><img src="/images/story_coffee.png"></a> + <a class='anchorImg' href="//commons.wikimedia.org/wiki/File:Coffee_Berries.jpg"><img src="/images/story_coffee.png"></a> <h3 id="grounds-for-removal">Grounds for Removal<br><small>July 2014</small></h3> <p>A nutritional supplement company requested the removal of all references to the term “coffee berries” from the <a href='//en.wikipedia.org/wiki/Main_Page'>English Wikipedia</a> article on <a href='//en.wikipedia.org/wiki/Coffee'>coffee</a>, claiming both inaccuracy and infringement of their trademark, COFFEEBERRY®. We responded that the community of editors felt that “coffee berry” was an acceptable term to refer to the fruit of the <a href='//en.wikipedia.org/wiki/Coffea'>coffee plant</a>. We also explained that trademarking a pre-existing word cannot prevent others from using the word for its original meaning. Trademark rights simply don’t give companies total control over everyday words.</p> </div> @@ -185,7 +185,7 @@ <div class="col-md-4"> <div class="story"> - <a href="//en.wikipedia.org/wiki/File:Myanmar_visa.jpg"><img src="/images/story_myanmar.png"></a> + <a class='anchorImg' href="//en.wikipedia.org/wiki/File:Myanmar_visa.jpg"><img src="/images/story_myanmar.png"></a> <h3 id="unredacted">Unredacted<br><small>August 2014</small></h3> <p>When a blogger included a photo of his visa to visit <a href='//en.wikipedia.org/wiki/Burma#Etymology'>Burma/Myanmar</a> on his website, he had scrubbed his personal details from the image. He never expected the same picture to show up on <a href='//en.wikipedia.org/wiki/Main_Page'>English Wikipedia</a> in an article about the country's visa policy -- with the redactions removed and his information exposed. He wrote to us, asking to remove the photo. Given the nature of the information and the circumstances of how it was exposed, we took the image down.</p> </div> @@ -193,7 +193,7 @@ <div class="col-md-4"> <div class="story"> - <a href="//commons.wikimedia.org/wiki/File:Poster_of_Alexander_Crystal_Seer.jpg"><img src="/images/story_seer.png"></a> + <a class='anchorImg' href="//commons.wikimedia.org/wiki/File:Poster_of_Alexander_Crystal_Seer.jpg"><img src="/images/story_seer.png"></a> <h3 id="murky-future">A Murky Future<br><small>October 2014</small></h3> <p>A law firm representing an astrologer asked that we remove a <a href='//fr.wikipedia.org/wiki/Wikip%C3%A9dia:Accueil_principal'>French Wikipedia</a> article that chronicled her history of allegedly false predictions. Unusually, they cited Wikipedia’s own <a href='//en.wikipedia.org/wiki/Wikipedia:Biographies_of_living_persons'>policy on biographies of living persons</a> as a source of the article’s problems. We explained that the Wikimedia Foundation does not write or edit Wikipedia articles. We asked that they engage with the French Wikipedia community of volunteer editors and follow Wikipedia policies to address any issues of alleged inaccuracies with the community. </p> </div> @@ -213,7 +213,7 @@ <div class="col-md-4"> <div class="story"> - <a href="//commons.wikimedia.org/wiki/File:Audio_Sound_Arts_Studio_Control_Room.jpg"><img src="/images/story_studio.png"></a> + <a class='anchorImg' href="//commons.wikimedia.org/wiki/File:Audio_Sound_Arts_Studio_Control_Room.jpg"><img src="/images/story_studio.png"></a> <h3 id="no-take-backsies">No Take Backsies<br><small>September 2014</small></h3> <p>A public relations company demanded that we remove an image of a rapper. However, the photo had been freely licensed under <a href='//commons.wikimedia.org/wiki/Main_Page'>Wikimedia Commons</a> policy apparently by the artist and claimed holder of the copyright. Therefore, we declined to remove it. The PR company initially alleged that the portrayed musician was someone different from the rapper. They later appeared to suggest that the rapper had never intended to give his permission. As the story seemed to change, the community examined, and then re-examined, the original permission. In the end the community found that the image should be kept.</p> </div> @@ -233,7 +233,7 @@ <!-- New Voluntary Disclosure --> <div class="col-md-4"> <div class="story"> - <a href="//commons.wikimedia.org/wiki/File:LED_Verkehrssicherungsbalken.jpg"><img src="/images/story_emergency.png"></a> + <a class='anchorImg' href="//commons.wikimedia.org/wiki/File:LED_Verkehrssicherungsbalken.jpg"><img src="/images/story_emergency.png"></a> <h3 id="deadly-threat">A Deadly Threat</h3> <p>The community shares threats with the Foundation when they find them. When an anonymous poster made an alleged bomb threat, we found that the edit was made from an <a href='//en.wikipedia.org/wiki/IP_address'>IP address</a> that was near the apparent threat location. As permitted by our privacy policy, we alerted local police, passing on the IP address and details we had about the threat. The police informed us they had located and arrested the person in question, who allegedly had weapons available and reportedly confessed.</p> </div> @@ -241,7 +241,7 @@ <div class="col-md-4"> <div class="story"> - <a href="//commons.wikimedia.org/wiki/White_House#mediaviewer/File:SouthPorticoChristmas.jpg"><img src="/images/story_whitehouse.png"></a> + <a class='anchorImg' href="//commons.wikimedia.org/wiki/White_House#mediaviewer/File:SouthPorticoChristmas.jpg"><img src="/images/story_whitehouse.png"></a> <h3 id="president-threats">Revealing Presidential Threats</h3> <p>On rare occasions we discover threats against public figures. This is uncommon, but something that happens on large websites. An individual had made specific, graphic threats against President <a href='//en.wikipedia.org/wiki/Barack_Obama'>Barack Obama</a>. This is contrary to our policies, and against U.S. law. In cases of potential serious harm to a person, our <a href='//wikimediafoundation.org/wiki/Privacy_policy#To_Protect_You.2C_Ourselves_.26_Others'>privacy policy</a> allows us to disclose relevant information. We immediately took action, reporting the user’s <a href='//en.wikipedia.org/wiki/IP_address'>IP address</a>, <a href='//en.wikipedia.org/wiki/User_agent'>user agent information</a>, and email address to the <a href='//en.wikipedia.org/wiki/United_States_Secret_Service'>United States Secret Service</a>.</p> </div> @@ -249,7 +249,7 @@ <div class="col-md-4"> <div class="story"> - <a href="//commons.wikimedia.org/wiki/File:Suicide_Prevention_Day.jpg"><img src="/images/story_suicide.png"></a> + <a class='anchorImg' href="//commons.wikimedia.org/wiki/File:Suicide_Prevention_Day.jpg"><img src="/images/story_suicide.png"></a> <h3 id="dealing-with-suicide">Dealing with Suicide</h3> <p> Authorities <a href='//www.afsp.org/preventing-suicide/frequently-asked-questions'>advise</a> contacting emergency services when a loved one threatens suicide. When someone shared what appeared to be a credible intent to commit suicide, we notified their local police department. The person was able to get medical help, and later let us know they were okay. If you are considering suicide, please <a href='//www.afsp.org/preventing-suicide/find-help'>seek out a mental health professional immediately</a>. You can also contact emergency services; visit an emergency room or psychiatric walk-in clinic; or call a <a href='//www.iasp.info/resources/Crisis_Centres'>suicide prevention hotline</a>.</p> </div> @@ -262,7 +262,7 @@ <!-- Old Content Alteration --> <div class="col-md-4"> <div class="story"> - <a href="//fr.wikipedia.org/wiki/Station_hertzienne_militaire_de_Pierre-sur-Haute#mediaviewer/Fichier:Base_militaire_de_Pierre-sur-Haute.jpg"><img src="/images/story_dcri.png"></a> + <a class='anchorImg' href="//fr.wikipedia.org/wiki/Station_hertzienne_militaire_de_Pierre-sur-Haute#mediaviewer/Fichier:Base_militaire_de_Pierre-sur-Haute.jpg"><img src="/images/story_dcri.png"></a> <h3 id="french-agency">French Intelligence Agency<br><small>March 2013</small></h3> <p>A <a href='//en.wikipedia.org/wiki/Direction_centrale_du_renseignement_int%C3%A9rieur'>French intelligence agency</a> summoned a Wikipedia user to its offices, and threatened him with severe criminal penalties if he did not use his administrative rights to delete information about a <a href='//fr.wikipedia.org/wiki/Station_hertzienne_militaire_de_Pierre-sur-Haute'>military base</a> from <a href='//fr.wikipedia.org/'>French Wikipedia</a> that the agency deemed classified. The supposedly classified information was actually publicly available because the military had provided interviews and a tour of the base to local reporters. We defended the user involved and fought to keep the content up on Wikipedia. <a href='//meta.wikimedia.org/wiki/Legal_and_Community_Advocacy/Statement_on_France'>Read more...</a></p> </div> @@ -270,7 +270,7 @@ <div class="col-md-4"> <div class="story"> - <a href="//commons.wikimedia.org/wiki/Commons:Featured_picture_candidates/File:Macaca_nigra_self-portrait_%28rotated_and_cropped%29.jpg#File:Macaca_nigra_self-portrait_.28rotated_and_cropped.29.jpg"><img src="/images/story_monkey.png"></a> + <a class='anchorImg' href="//commons.wikimedia.org/wiki/Commons:Featured_picture_candidates/File:Macaca_nigra_self-portrait_%28rotated_and_cropped%29.jpg#File:Macaca_nigra_self-portrait_.28rotated_and_cropped.29.jpg"><img src="/images/story_monkey.png"></a> <h3 id="monkey-selfie">Monkey Selfie<br><small>January 2014</small></h3> <p>A photographer left his camera unattended in a national park in <a href='//en.wikipedia.org/wiki/North_Sulawesi'>North Sulawesi</a>, <a href='//en.wikipedia.org/wiki/Indonesia'>Indonesia</a>. A female <a href='//en.wikipedia.org/wiki/Celebes_crested_macaque'>crested black macaque monkey</a> got ahold of the camera and took a series of pictures, including some self-portraits. The pictures were featured in an online newspaper article and eventually posted to <a href='//commons.wikimedia.org/'>Commons</a>. We received a takedown request from the photographer, claiming that he owned the copyright to the photographs. We didn't agree, so we denied the request.</p> </div> @@ -278,7 +278,7 @@ <div class="col-md-4"> <div class="story"> - <a href="//en.wikipedia.org/wiki/Mount_Wellington_%28Tasmania%29#mediaviewer/File:Mount_Wellington.jpg"><img src="/images/story_aboriginal.png"></a> + <a class='anchorImg' href="//en.wikipedia.org/wiki/Mount_Wellington_%28Tasmania%29#mediaviewer/File:Mount_Wellington.jpg"><img src="/images/story_aboriginal.png"></a> <h3 id="aboriginal">Aboriginal Language<br><small>July 2012</small></h3> <p>A Tasmanian aboriginal language center demanded the removal of the <a href='//en.wikipedia.org'>English Wikipedia</a> <a href='//en.wikipedia.org/wiki/Palawa_kani'>article on 'palawa kani'</a>, claiming copyright over the entirety of the language. We refused to remove the article because copyright law simply cannot be used to stop people from using an entire language or to prevent general discussion about the language. Such a broad claim would have chilled free speech and negatively impacted research, education, and public discourse—activities that Wikimedia serves to promote.</p> </div> @@ -290,7 +290,7 @@ <!-- Old DMCA --> <div class="col-md-4"> <div class="story"> - <a href="//en.wikipedia.org/wiki/Babe_Ruth%27s_called_shot#mediaviewer/File:Ruth1932-1.jpg"><img src="/images/story_ruth.png"></a> + <a class='anchorImg' href="//en.wikipedia.org/wiki/Babe_Ruth%27s_called_shot#mediaviewer/File:Ruth1932-1.jpg"><img src="/images/story_ruth.png"></a> <h3 id="babe-ruth"> Babe Ruth's Called Shot<br><small>March 2014</small> </h3> @@ -310,7 +310,7 @@ <div class="col-md-4"> <div class="story"> - <a href="//commons.wikimedia.org/wiki/Jane_Austen#mediaviewer/File:Jane_Austen_coloured_version.jpg"><img src="/images/story_classics.png"></a> + <a class='anchorImg' href="//commons.wikimedia.org/wiki/Jane_Austen#mediaviewer/File:Jane_Austen_coloured_version.jpg"><img src="/images/story_classics.png"></a> <h3 id="the-classics"> The Classics<br><small>November 2013</small> </h3> diff --git a/build/stylesheets/graph.css b/build/stylesheets/graph.css index cda6412..05cede7 100644 --- a/build/stylesheets/graph.css +++ b/build/stylesheets/graph.css @@ -14,6 +14,8 @@ .analytics #complied_requests { display: inline-block; margin: 10px; margin-bottom: 10px; padding: 10px; background: #E4E6E8; } .analytics #complied_requests label { font-weight: normal; } +.flagBorder { fill: none; stroke: #343838; stroke-width: 1px; } + #targeted_takedown_graph, #targeted_dmca_graph, #where_from_graph { margin-left: 13px; width: 400px; height: 100px; padding-bottom: 30px; } #dmca_requests_graph { margin-left: -20px; width: 750px; height: 100px; padding-bottom: 30px; } diff --git a/build/stylesheets/master.css b/build/stylesheets/master.css index 9c48686..2a8ceb9 100644 --- a/build/stylesheets/master.css +++ b/build/stylesheets/master.css @@ -3,12 +3,13 @@ .container { padding: 0; } -@media (max-width: 990px) { .summary__wrapper .col-md-6 { padding: 0 !important; } } -.info_type { padding: 0; } -.info_type .info_type__head { margin-left: 5px; } -.info_type .col-md-6 { padding: 0 5px; } -.info_type p { clear: both; padding: 30px 5px 0 5px; } +.acc_affected__wrapper { margin-top: 40px; } +@media (min-width: 992px) { .acc_affected__wrapper { margin: 0; position: absolute; top: 50%; transform: translateY(-50%); right: 25px; } } +.info_type { margin-top: 40px; } + +@media (max-width: 991px) { .summary__wrapper .col-md-6 { padding: 0 !important; } + .info_type .col-md-6, .info_type .col-md-3 { padding: 0 !important; } } .clear { clear: both; } a { color: #375baf; } @@ -49,7 +50,9 @@ @media all and (min-width: 992px) { .story { border: 1px solid rgba(55, 91, 175, 0.1); border-top: 6px solid #375baf; box-shadow: 0 17px 35px -17px #375baf; } } .story:hover { text-decoration: none; } @media all and (min-width: 992px) { .story:hover.bignav { box-shadow: 0 5px 35px -17px #375baf; } } -.story img { width: 100%; height: 100%; } +.story .anchorImg { display: block; width: 100%; overflow: hidden; height: 555px; } +@media (min-width: 992px) { .story .anchorImg { height: 165px; } } +.story img { width: 100%; height: auto; } .story hr { border-color: #d1d1d1; margin: 10px 0; } .story h3 { margin: 0; font-family: serif; font-size: 22px/28px; color: #343838; margin: 20px 16px 20px; } .story h3 small { font: 12px sans-serif; text-transform: uppercase; font-weight: 400; color: #666666; } @@ -113,6 +116,8 @@ .scorecard_bottom { margin-top: 70px; } +.story_bottom { margin-top: 40px; } + .navbar-toggle { margin-right: 12px; } .navbar-default .navbar-toggle:hover, .navbar-default .navbar-toggle:focus { background-color: #fff; } diff --git a/locales/en.yml b/locales/en.yml index c3122b4..cc91363 100644 --- a/locales/en.yml +++ b/locales/en.yml @@ -42,6 +42,7 @@ quote: "Privacy is something that we maintain for the good of ourselves and others." cite: "<a href='//en.wikipedia.org/wiki/Mary_Alice_Monroe'>Mary Alice Monroe</a><small>Author (<a href='//en.wikiquote.org/wiki/Mary_Alice_Monroe'>2012</a>)</small>" summary: "Summary" + user_accounts_affected: "User accounts affected" govt_requests: "Government requests breakdown" compared_to_others: "Compared to other companies, we received relatively few requests" request_response: "Requests for user data, and how we responded" @@ -56,7 +57,7 @@ national_security_requests: "National security requests" user_potentially_affected: "User accounts potentially affected" user_actually_affected: "User accounts actually affected" - user_accounts_notified: "User accounts Notified" + user_accounts_notified: "User accounts notified" total_requests: "Total requests" information_produced: "Information produced" information_produced_all: "Information produced (all)" diff --git a/source/javascripts/privacy.js b/source/javascripts/privacy.js index 218d05d..7f9ac2b 100644 --- a/source/javascripts/privacy.js +++ b/source/javascripts/privacy.js @@ -414,6 +414,7 @@ // If its a country graphy if ( hasFlags ) { var flags = graph.selectAll( 'image.' + className ).data( data ) + flags .enter() .append( 'image' ) @@ -426,7 +427,25 @@ dispatch.filter(); } ) .attr( 'class', className ) - .classed( 'flag', true); + .classed( 'flag', true) + .each(function(d, i) { + // add both rect and flag at same position to make it + // look like a border + if ( typeof codes[ d.key.split( '*' )[0] ] !== 'undefined' ) { + graph + .append('rect') + .attr({ + 'class': 'flagBorder', + 'width': '28', + 'height': '16', + 'y': function() { + return ( ( i + 1 ) * 40 ) - 8 + }, + 'x': '-33' + }) + } + + }) flags .on( 'mouseover', function ( d ) { diff --git a/source/javascripts/rag.js b/source/javascripts/rag.js index 0232c0b..a522713 100644 --- a/source/javascripts/rag.js +++ b/source/javascripts/rag.js @@ -250,7 +250,25 @@ .enter() .append( 'image' ) .attr( 'class', 'flags' ) - .classed( 'flag', true); + .classed( 'flag', true) + .each(function(d, i) { + // add both rect and flag at same position to make it + // look like a border + if ( typeof codes[ d.key.split( '*' )[0] ] !== 'undefined' ) { + graph + .append('rect') + .attr({ + 'class': 'flagBorder', + 'width': '28', + 'height': '16', + 'y': function() { + return ( ( i + 1 ) * 40 ) - 8 + }, + 'x': '-33' + }) + } + }) + flags .attr( 'width', 28 ) .attr( 'height', 16 ) @@ -354,7 +372,26 @@ return xScale( d.value ); } ); bar.exit().remove(); + } + function updateFlagBorder() { + + $('.flagBorder').remove() + + $('#where_from_graph .flags').each(function(i) { + if ( this.href.baseVal !== '' ) { + graph.append('rect') + .attr({ + 'class': 'flagBorder', + 'width': '28', + 'height': '16', + 'y': function() { + return ( ( i + 1 ) * 40 ) - 8 + }, + 'x': '-33' + }) + } + }) } makeGraph( data, current ); @@ -364,6 +401,7 @@ $( this ).addClass( 'active' ); var duration = $( this ).attr( 'id' ).split( '_' )[ 2 ]; makeGraph( data, duration ); + updateFlagBorder() } ); } diff --git a/source/localizable/content.html.erb b/source/localizable/content.html.erb index 23934a6..4edc1d9 100644 --- a/source/localizable/content.html.erb +++ b/source/localizable/content.html.erb @@ -44,7 +44,7 @@ <div class="col-md-4"> <div class="story"> - <a href="//commons.wikimedia.org/wiki/File:PalazzoTrinci023.jpg"><img src="./images/story_dictating.jpg" ></a> + <a class='anchorImg' href="//commons.wikimedia.org/wiki/File:PalazzoTrinci023.jpg"><img src="./images/story_dictating.jpg" ></a> <h3><%= t('content.story_dictating_title') %></h3> <p><%= t('content.story_dictating_body') %></p> </div> @@ -52,7 +52,7 @@ <div class="col-md-4"> <div class="story"> - <a href="//commons.wikimedia.org/wiki/File:Whisky_(4285804207).jpg"><img src="./images/story_whisky.jpg"></a> + <a class='anchorImg' href="//commons.wikimedia.org/wiki/File:Whisky_(4285804207).jpg"><img src="./images/story_whisky.jpg"></a> <h3><%= t('content.story_whisky_title') %></h3> <p><%= t('content.story_whisky_body') %></p> </div> @@ -60,7 +60,7 @@ <div class="col-md-4"> <div class="story"> - <a href="//commons.wikimedia.org/wiki/File:Zanni_mask.jpg"><img src="./images/story_zanni.jpg"></a> + <a class='anchorImg' href="//commons.wikimedia.org/wiki/File:Zanni_mask.jpg"><img src="./images/story_zanni.jpg"></a> <h3><%= t('content.story_zanni_title') %></h3> <p><%= t('content.story_zanni_body') %></p> </div> @@ -241,7 +241,7 @@ <div class="col-md-4"> <div class="story"> - <a href="//commons.wikimedia.org/wiki/File:Illustration_of_Bernie_Sanders.jpg"><img src="./images/story_bern.jpg"></a> + <a class='anchorImg' href="//commons.wikimedia.org/wiki/File:Illustration_of_Bernie_Sanders.jpg"><img src="./images/story_bern.jpg"></a> <h3><%= t('content.story_bern_title') %></h3> <p><%= t('content.story_bern_body') %></p> </div> @@ -249,7 +249,7 @@ <div class="col-md-4"> <div class="story"> - <a href="//commons.wikimedia.org/wiki/File:Red_cinema_sits_(11285613595).jpg"><img src="./images/story_cinema.jpg"></a> + <a class='anchorImg' href="//commons.wikimedia.org/wiki/File:Red_cinema_sits_(11285613595).jpg"><img src="./images/story_cinema.jpg"></a> <h3><%= t('content.story_cinema_title') %></h3> <p><%= t('content.story_cinema_body') %></p> </div> @@ -257,7 +257,7 @@ <div class="col-md-4"> <div class="story"> - <a href="//commons.wikimedia.org/wiki/File:Newspaper_(15840560238).jpg"><img src="./images/story_newspaper.jpg"></a> + <a class='anchorImg' href="//commons.wikimedia.org/wiki/File:Newspaper_(15840560238).jpg"><img src="./images/story_newspaper.jpg"></a> <h3><%= t('content.story_newspaper_title') %></h3> <p><%= t('content.story_newspaper_body') %></p> </div> diff --git a/source/localizable/privacy.html.erb b/source/localizable/privacy.html.erb index ed17a88..dd3a00a 100644 --- a/source/localizable/privacy.html.erb +++ b/source/localizable/privacy.html.erb @@ -91,15 +91,27 @@ <td><%= t('privacy.information_produced') %></td> <td>0</td> </tr> - <tr class="highlight"> + </table> + </div> + </div> + + <div class="col-md-6 acc_affected__wrapper"> + <div class="story"> + <h3> + <small><%= t('dates.jan') %> – <%= t('dates.jun') %> 2016</small><br /> + <%= t('privacy.user_accounts_affected') %> + </h3> + <hr /> + <table> + <tr class="indent"> <td><%= t('privacy.user_potentially_affected') %></td> <td>14</td> </tr> - <tr class="highlight"> + <tr class="indent"> <td><%= t('privacy.user_actually_affected') %></td> <td>0</td> </tr> - <tr class="highlight"> + <tr class="indent"> <td><%= t('privacy.user_accounts_notified') %></td> <td>0</td> </tr> @@ -107,32 +119,33 @@ </div> </div> - <div class="col-md-6 info_type"> - +</div> + +<div class="col-md-12 info_type"> + + <div class="col-md-6"> <h2 class="info_type__head">Type of information requested</h2> - - <div class="col-md-6"> - <section class="scorecard"> - <h2><%= t('dates.jan') %> 2016 – <%= t('dates.jun') %> 2016</h2> - <dl> - <dt><%= t('privacy.content_requests') %></dt> - <dd>0</dd> - </dl> - </section> - </div> - - <div class="col-md-6"> - <section class="scorecard"> - <h2><%= t('dates.jan') %> 2016 – <%= t('dates.jun') %> 2016</h2> - <dl> - <dt><%= t('privacy.non-content_requests') %></dt> - <dd>13</dd> - </dl> - </section> - </div> - <p>Most content information on the Wikimedia projects is the public content of articles and project pages; “non-content” information refers to information such as <a href="https://en.wikipedia.org/wiki/IP_address">IP addresses</a> or <a href="https://en.wikipedia.org/wiki/User_agent">user agent</a> information. The distinction comes from the <a href="https://en.wikipedia.org/wiki/Electronic_Communications_Privacy_Act">Electronic Communications Privacy Act</a>, or ECPA. Please see our <a href="./faq.html">FAQ</a> for more information.</p> + </div> + <div class="col-md-3"> + <section class="scorecard"> + <h2><%= t('dates.jan') %> 2016 – <%= t('dates.jun') %> 2016</h2> + <dl> + <dt><%= t('privacy.content_requests') %></dt> + <dd>0</dd> + </dl> + </section> + </div> + + <div class="col-md-3"> + <section class="scorecard"> + <h2><%= t('dates.jan') %> 2016 – <%= t('dates.jun') %> 2016</h2> + <dl> + <dt><%= t('privacy.non-content_requests') %></dt> + <dd>13</dd> + </dl> + </section> </div> </div> diff --git a/source/localizable/stories.html.erb b/source/localizable/stories.html.erb index abdd477..b5b14a1 100644 --- a/source/localizable/stories.html.erb +++ b/source/localizable/stories.html.erb @@ -9,7 +9,7 @@ <div class="col-md-4"> <div class="story"> - <a href="//commons.wikimedia.org/wiki/File:PalazzoTrinci023.jpg"><img src="./images/story_dictating.jpg" ></a> + <a class='anchorImg' href="//commons.wikimedia.org/wiki/File:PalazzoTrinci023.jpg"><img src="./images/story_dictating.jpg" ></a> <h3><%= t('content.story_dictating_title') %></h3> <p><%= t('content.story_dictating_body') %></p> </div> @@ -17,7 +17,7 @@ <div class="col-md-4"> <div class="story"> - <a href="//commons.wikimedia.org/wiki/File:Whisky_(4285804207).jpg"><img src="./images/story_whisky.jpg"></a> + <a class='anchorImg' href="//commons.wikimedia.org/wiki/File:Whisky_(4285804207).jpg"><img src="./images/story_whisky.jpg"></a> <h3><%= t('content.story_whisky_title') %></h3> <p><%= t('content.story_whisky_body') %></p> </div> @@ -25,7 +25,7 @@ <div class="col-md-4"> <div class="story"> - <a href="//commons.wikimedia.org/wiki/File:Zanni_mask.jpg"><img src="./images/story_zanni.jpg"></a> + <a class='anchorImg' href="//commons.wikimedia.org/wiki/File:Zanni_mask.jpg"><img src="./images/story_zanni.jpg"></a> <h3><%= t('content.story_zanni_title') %></h3> <p><%= t('content.story_zanni_body') %></p> </div> @@ -36,7 +36,7 @@ <div class="col-md-4"> <div class="story"> - <a href="//commons.wikimedia.org/wiki/File:Illustration_of_Bernie_Sanders.jpg"><img src="./images/story_bern.jpg"></a> + <a class='anchorImg' href="//commons.wikimedia.org/wiki/File:Illustration_of_Bernie_Sanders.jpg"><img src="./images/story_bern.jpg"></a> <h3><%= t('content.story_bern_title') %></h3> <p><%= t('content.story_bern_body') %></p> </div> @@ -44,7 +44,7 @@ <div class="col-md-4"> <div class="story"> - <a href="//commons.wikimedia.org/wiki/File:Red_cinema_sits_(11285613595).jpg"><img src="./images/story_cinema.jpg"></a> + <a class='anchorImg' href="//commons.wikimedia.org/wiki/File:Red_cinema_sits_(11285613595).jpg"><img src="./images/story_cinema.jpg"></a> <h3><%= t('content.story_cinema_title') %></h3> <p><%= t('content.story_cinema_body') %></p> </div> @@ -52,7 +52,7 @@ <div class="col-md-4"> <div class="story"> - <a href="//commons.wikimedia.org/wiki/File:Newspaper_(15840560238).jpg"><img src="./images/story_newspaper.jpg"></a> + <a class='anchorImg' href="//commons.wikimedia.org/wiki/File:Newspaper_(15840560238).jpg"><img src="./images/story_newspaper.jpg"></a> <h3><%= t('content.story_newspaper_title') %></h3> <p><%= t('content.story_newspaper_body') %></p> </div> @@ -64,7 +64,7 @@ <!-- 2015 Stories--> <div class="col-md-4"> <div class="story"> - <a href="//commons.wikimedia.org/wiki/Category:Vulpes_vulpes#/media/File:Kew_Gardens_-_London_-_September_2008_%282958753889%29.jpg"><img src="/images/story_stock.png"></a> + <a class='anchorImg' href="//commons.wikimedia.org/wiki/Category:Vulpes_vulpes#/media/File:Kew_Gardens_-_London_-_September_2008_%282958753889%29.jpg"><img src="/images/story_stock.png"></a> <h3 id="right-way"><%= t('content.story_stock_title') %></h3> <p><%= t('content.story_stock_body') %></p> </div> @@ -72,7 +72,7 @@ <div class="col-md-4"> <div class="story"> - <a href="//commons.wikimedia.org/wiki/Barnstar#/media/File:Original_Barnstar_Hires.png"><img src="/images/story_barnstar.png"></a> + <a class='anchorImg' href="//commons.wikimedia.org/wiki/Barnstar#/media/File:Original_Barnstar_Hires.png"><img src="/images/story_barnstar.png"></a> <h3 id="home-made"><%= t('content.story_barnstar_title') %></h3> <p><%= t('content.story_barnstar_body') %></p> </div> @@ -80,7 +80,7 @@ <div class="col-md-4"> <div class="story"> - <a href="//commons.wikimedia.org/wiki/Wiki#/media/File:Chiodini_wiki.jpg"><img src="/images/story_identity.png"></a> + <a class='anchorImg' href="//commons.wikimedia.org/wiki/Wiki#/media/File:Chiodini_wiki.jpg"><img src="/images/story_identity.png"></a> <h3 id="mistaken-identity"><%= t('content.story_identity_title') %></h3> <p><%= t('content.story_identity_body') %></p> </div> @@ -91,7 +91,7 @@ <div class="col-md-4"> <div class="story"> - <a href="//commons.wikimedia.org/wiki/Category:Interiors_of_museums#/media/File:Preusser,_Karl_Louis_-_In_der_Dresdner_Galerie_-_1881.jpg"><img src="/images/story_kempler.png"></a> + <a class='anchorImg' href="//commons.wikimedia.org/wiki/Category:Interiors_of_museums#/media/File:Preusser,_Karl_Louis_-_In_der_Dresdner_Galerie_-_1881.jpg"><img src="/images/story_kempler.png"></a> <h3 id="copyrighting-facts"><%= t('content.story_kempler_title') %></h3> <p><%= t('content.story_kempler_body') %></p> </div> @@ -99,7 +99,7 @@ <div class="col-md-4"> <div class="story"> - <a href="//commons.wikimedia.org/wiki/File:Screenshot_from_IMAX%C2%AE_3D_movie_Hidden_Universe_showing_the_Helix_Nebula_in_infrared.jpg"><img src="/images/story_guru.png"></a> + <a class='anchorImg' href="//commons.wikimedia.org/wiki/File:Screenshot_from_IMAX%C2%AE_3D_movie_Hidden_Universe_showing_the_Helix_Nebula_in_infrared.jpg"><img src="/images/story_guru.png"></a> <h3 id="citation-needed"><%= t('content.story_guru_title') %></h3> <p><%= t('content.story_guru_body') %></p> </div> @@ -107,7 +107,7 @@ <div class="col-md-4"> <div class="story"> - <a href="//commons.wikimedia.org/wiki/File:TaylorFillmore.jpg"><img src="/images/story_political.png"></a> + <a class='anchorImg' href="//commons.wikimedia.org/wiki/File:TaylorFillmore.jpg"><img src="/images/story_political.png"></a> <h3 id="political-points"><%= t('content.story_political_title') %></h3> <p><%= t('content.story_political_body') %></p> </div> @@ -119,7 +119,7 @@ <!-- New Content Alteration --> <div class="col-md-4"> <div class="story"> - <a href="//commons.wikimedia.org/wiki/File:Coffee_Berries.jpg"><img src="/images/story_coffee.png"></a> + <a class='anchorImg' href="//commons.wikimedia.org/wiki/File:Coffee_Berries.jpg"><img src="/images/story_coffee.png"></a> <h3 id="grounds-for-removal"><%= t('content.story_coffee_title') %></h3> <p><%= t('content.story_coffee_body') %></p> </div> @@ -127,7 +127,7 @@ <div class="col-md-4"> <div class="story"> - <a href="//en.wikipedia.org/wiki/File:Myanmar_visa.jpg"><img src="/images/story_myanmar.png"></a> + <a class='anchorImg' href="//en.wikipedia.org/wiki/File:Myanmar_visa.jpg"><img src="/images/story_myanmar.png"></a> <h3 id="unredacted"><%= t('content.story_myanmar_title') %></h3> <p><%= t('content.story_myanmar_body') %></p> </div> @@ -135,7 +135,7 @@ <div class="col-md-4"> <div class="story"> - <a href="//commons.wikimedia.org/wiki/File:Poster_of_Alexander_Crystal_Seer.jpg"><img src="/images/story_seer.png"></a> + <a class='anchorImg' href="//commons.wikimedia.org/wiki/File:Poster_of_Alexander_Crystal_Seer.jpg"><img src="/images/story_seer.png"></a> <h3 id="murky-future"><%= t('content.story_seer_title') %></h3> <p><%= t('content.story_seer_body') %></p> </div> @@ -155,7 +155,7 @@ <div class="col-md-4"> <div class="story"> - <a href="//commons.wikimedia.org/wiki/File:Audio_Sound_Arts_Studio_Control_Room.jpg"><img src="/images/story_studio.png"></a> + <a class='anchorImg' href="//commons.wikimedia.org/wiki/File:Audio_Sound_Arts_Studio_Control_Room.jpg"><img src="/images/story_studio.png"></a> <h3 id="no-take-backsies"><%= t('content.story_studio_title') %></h3> <p><%= t('content.story_studio_body') %></p> </div> @@ -175,7 +175,7 @@ <!-- New Voluntary Disclosure --> <div class="col-md-4"> <div class="story"> - <a href="//commons.wikimedia.org/wiki/File:LED_Verkehrssicherungsbalken.jpg"><img src="/images/story_emergency.png"></a> + <a class='anchorImg' href="//commons.wikimedia.org/wiki/File:LED_Verkehrssicherungsbalken.jpg"><img src="/images/story_emergency.png"></a> <h3 id="deadly-threat"><%= t('privacy.story_emergency_title') %></h3> <p><%= t('privacy.story_emergency_body') %></p> </div> @@ -183,7 +183,7 @@ <div class="col-md-4"> <div class="story"> - <a href="//commons.wikimedia.org/wiki/White_House#mediaviewer/File:SouthPorticoChristmas.jpg"><img src="/images/story_whitehouse.png"></a> + <a class='anchorImg' href="//commons.wikimedia.org/wiki/White_House#mediaviewer/File:SouthPorticoChristmas.jpg"><img src="/images/story_whitehouse.png"></a> <h3 id="president-threats"><%= t('privacy.story_whitehouse_title') %></h3> <p><%= t('privacy.story_whitehouse_body') %></p> </div> @@ -191,7 +191,7 @@ <div class="col-md-4"> <div class="story"> - <a href="//commons.wikimedia.org/wiki/File:Suicide_Prevention_Day.jpg"><img src="/images/story_suicide.png"></a> + <a class='anchorImg' href="//commons.wikimedia.org/wiki/File:Suicide_Prevention_Day.jpg"><img src="/images/story_suicide.png"></a> <h3 id="dealing-with-suicide"><%= t('privacy.story_suicide_title') %></h3> <p><%= t('privacy.story_suicide_body') %></p> </div> @@ -204,7 +204,7 @@ <!-- Old Content Alteration --> <div class="col-md-4"> <div class="story"> - <a href="//fr.wikipedia.org/wiki/Station_hertzienne_militaire_de_Pierre-sur-Haute#mediaviewer/Fichier:Base_militaire_de_Pierre-sur-Haute.jpg"><img src="/images/story_dcri.png"></a> + <a class='anchorImg' href="//fr.wikipedia.org/wiki/Station_hertzienne_militaire_de_Pierre-sur-Haute#mediaviewer/Fichier:Base_militaire_de_Pierre-sur-Haute.jpg"><img src="/images/story_dcri.png"></a> <h3 id="french-agency"><%= t('content.story1_title') %></h3> <p><%= t('content.story1_body') %></p> </div> @@ -212,7 +212,7 @@ <div class="col-md-4"> <div class="story"> - <a href="//commons.wikimedia.org/wiki/Commons:Featured_picture_candidates/File:Macaca_nigra_self-portrait_%28rotated_and_cropped%29.jpg#File:Macaca_nigra_self-portrait_.28rotated_and_cropped.29.jpg"><img src="/images/story_monkey.png"></a> + <a class='anchorImg' href="//commons.wikimedia.org/wiki/Commons:Featured_picture_candidates/File:Macaca_nigra_self-portrait_%28rotated_and_cropped%29.jpg#File:Macaca_nigra_self-portrait_.28rotated_and_cropped.29.jpg"><img src="/images/story_monkey.png"></a> <h3 id="monkey-selfie"><%= t('content.story2_title') %></h3> <p><%= t('content.story2_body') %></p> </div> @@ -220,7 +220,7 @@ <div class="col-md-4"> <div class="story"> - <a href="//en.wikipedia.org/wiki/Mount_Wellington_%28Tasmania%29#mediaviewer/File:Mount_Wellington.jpg"><img src="/images/story_aboriginal.png"></a> + <a class='anchorImg' href="//en.wikipedia.org/wiki/Mount_Wellington_%28Tasmania%29#mediaviewer/File:Mount_Wellington.jpg"><img src="/images/story_aboriginal.png"></a> <h3 id="aboriginal"><%= t('content.story3_title') %></h3> <p><%= t('content.story3_body') %></p> </div> @@ -232,7 +232,7 @@ <!-- Old DMCA --> <div class="col-md-4"> <div class="story"> - <a href="//en.wikipedia.org/wiki/Babe_Ruth%27s_called_shot#mediaviewer/File:Ruth1932-1.jpg"><img src="/images/story_ruth.png"></a> + <a class='anchorImg' href="//en.wikipedia.org/wiki/Babe_Ruth%27s_called_shot#mediaviewer/File:Ruth1932-1.jpg"><img src="/images/story_ruth.png"></a> <h3 id="babe-ruth"> <%= t('content.s_t_babe_ruth') %> </h3> @@ -252,7 +252,7 @@ <div class="col-md-4"> <div class="story"> - <a href="//commons.wikimedia.org/wiki/Jane_Austen#mediaviewer/File:Jane_Austen_coloured_version.jpg"><img src="/images/story_classics.png"></a> + <a class='anchorImg' href="//commons.wikimedia.org/wiki/Jane_Austen#mediaviewer/File:Jane_Austen_coloured_version.jpg"><img src="/images/story_classics.png"></a> <h3 id="the-classics"> <%= t('content.s_t_classic') %> </h3> diff --git a/source/stylesheets/graph.css.scss b/source/stylesheets/graph.css.scss index 2a4a72e..adea13f 100644 --- a/source/stylesheets/graph.css.scss +++ b/source/stylesheets/graph.css.scss @@ -81,6 +81,12 @@ } } +.flagBorder { + fill: none; + stroke: $black; + stroke-width: 1px; +} + #targeted_takedown_graph, #targeted_dmca_graph, #where_from_graph { diff --git a/source/stylesheets/master.css.scss b/source/stylesheets/master.css.scss index c65b056..3398286 100644 --- a/source/stylesheets/master.css.scss +++ b/source/stylesheets/master.css.scss @@ -12,31 +12,51 @@ padding: 0; } -@media (max-width: 990px) { +.summary_table { + // width: 70%; +} + +.acc_affected__wrapper { + margin-top: 40px; + @media (min-width: 992px) { + margin: 0; + position: absolute; + top: 50%; + transform: translateY(-50%); + right: 25px; + } +} + +.info_type { + margin-top: 40px; +} + +@media (max-width: 991px) { .summary__wrapper { .col-md-6 { padding: 0 !important; } } + .info_type { + .col-md-6, .col-md-3 { + padding: 0 !important; + } + } } -.summary_table { - // width: 70%; -} - -.info_type { - padding: 0; - .info_type__head { - margin-left: 5px; - } - .col-md-6 { - padding: 0 5px; - } - p { - clear: both; - padding: 30px 5px 0 5px; - } -} +// .info_type { +// padding: 0; +// .info_type__head { +// margin-left: 5px; +// } +// .col-md-6 { +// padding: 0 5px; +// } +// p { +// clear: both; +// padding: 30px 5px 0 5px; +// } +// } .clear { clear: both; @@ -200,11 +220,19 @@ } } - + .anchorImg { + display: block; + width: 100%; + overflow: hidden; + height: 555px; + @media (min-width: 992px) { + height: 165px; + } + } img { width: 100%; - height: 100%; + height: auto; } hr { @@ -525,6 +553,10 @@ margin-top: 70px; } +.story_bottom { + margin-top: 40px; +} + .navbar-toggle { margin-right: 12px; -- To view, visit https://gerrit.wikimedia.org/r/301430 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I79c967cf84ab796ec0ecce52131b94698b4f6499 Gerrit-PatchSet: 1 Gerrit-Project: wikimedia/TransparencyReport-private Gerrit-Branch: master Gerrit-Owner: Siddparmar <siddharth2par...@gmail.com> _______________________________________________ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits