r109113 MediaWiki - Code Review archive

Repository:MediaWiki
Revision:r109112‎ | r109113 | r109114 >
Date:07:12, 17 January 2012
Author:kaldari
Status:ok
Tags:
Comment:
some prettifying
Modified paths:
  • /trunk/extensions/CongressLookup/SpecialCongressLookup.php (modified) (history)

Diff [purge]

Index: trunk/extensions/CongressLookup/SpecialCongressLookup.php
@@ -63,29 +63,37 @@
6464 margin: 2em;
6565 font-family: arial, sans-serif;
6666 font-size: 15px;
 67+ background: black url('//upload.wikimedia.org/wikipedia/commons/0/0a/WP_SOPA_W_with_Gradient.png') no-repeat 0 0;
6768 }
6869 a:link, a:visited {
6970 color: #28a6b1;
7071 }
7172 a:hover, a:active {
72 - color: #55a73c;
 73+ color: #999999;
7374 }
74 -table#takeAction {
75 - font-family: inherit;
76 - font-size: inherit;
77 - width: 100%;
 75+div#everything {
 76+ width: 920px;
 77+ margin: 0 auto;
7878 }
79 -table#takeAction td {
80 - vertical-align: top;
81 - padding: 0.2em;
 79+div#instructions {
 80+ float:left;
 81+ text-align: left;
 82+ width: 580px;
 83+ background-color: #202020;
 84+ -moz-border-radius: 10px;
 85+ -webkit-border-radius: 10px;
 86+ border-radius: 10px;
 87+ padding: 5px 20px 20px 20px;
 88+ filter:alpha(opacity=90);
 89+ -moz-opacity:0.90;
 90+ -khtml-opacity: 0.90;
 91+ opacity: 0.90;
8292 }
83 -table#takeAction td#instructions {
84 - font-family: georgia, serif;
85 - width: 60%;
 93+div#contacts {
 94+ float:left;
 95+ width: 259px;
 96+ padding: 5px 20px;
8697 }
87 -table#takeAction td#contacts {
88 - padding: 0.2em 2em;
89 -}
9098 table.person {
9199 margin-bottom: 1em;
92100 }
@@ -95,44 +103,53 @@
96104 p {
97105 margin: 1em 0;
98106 }
 107+p.quote {
 108+ font-family: georgia, serif;
 109+ font-size: 14px;
 110+ color: #CCCCCC;
 111+}
99112 h3 {
100 - font-weight: bold;
101 - font-size: 12px;
 113+ font-weight: normal;
 114+ font-size: 20px;
102115 }
 116+h4 {
 117+ font-weight: normal;
 118+ font-size: 17px;
 119+}
103120 </style>
104121 </head>
105122 <body>
106 -<table id="takeAction" border="0" cellspacing="0" cellpadding="0" style="border:none;">
107 - <tr>
108 - <td id="instructions">
109 - <p>
110 - For maximum impact, please consider calling your US Representative and US Senators and explain that you are a constituent and that you oppose these bills and similar future legislation.
111 - </p>
112 -
113 - <h4>Things you may want to say to your Senator or Representative</h4>
114 - <p>
115 - “As one of your concerned constituents, I urge you to oppose SOPA and PIPA or any future bill that would censor free speech and damage the security of the Internet.”
116 - </p>
117 -
118 - <h4>Regarding Censorship</h4>
119 - <p>
120 - “The Internet has become an important communications tool allowing the free flow of ideas. As introduced in the House and the Senate, SOPA and PIPA would give the Justice Department and courts tremendous power to shut down entire sites. These bills ignore the principles of the First Amendment that require tailored solutions in lieu of across-the-board censorship. Unfortunately these bills represent terrible precedents for the United States and the world.”
121 - </p>
122 -
123 - <h4>Regarding Cybersecurity</h4>
124 - <p>
125 - “A safe and secure Web is vital to our privacy, our access to free knowledge, and to commerce. Hundreds of established authorities on the Internet believe that the required blocking of Internet sites in SOPA and PIPA is badly thought out and threatens Internet security.”
126 - </p>
127 - </td>
128 - <td id="contacts">
129 - <h4>Your Representatives:</h4>
 123+<div id="everything">
 124+<div id="instructions">
 125+ <h3>Take action to stop SOPA and PIPA, the internet blacklist bills</h3>
 126+ <p>
 127+ For maximum impact, please consider calling your US Representative and US Senators and explain that you are a constituent and that you oppose these bills and similar future legislation.
 128+ </p>
 129+
 130+ <h4>Things you may want to say to your Senator or Representative</h4>
 131+ <p class="quote">
 132+ “As one of your concerned constituents, I urge you to oppose SOPA and PIPA or any future bill that would censor free speech and damage the security of the Internet.”
 133+ </p>
 134+
 135+ <h4>Regarding Censorship</h4>
 136+ <p class="quote">
 137+ “The Internet has become an important communications tool allowing the free flow of ideas. As introduced in the House and the Senate, SOPA and PIPA would give the Justice Department and courts tremendous power to shut down entire sites. These bills ignore the principles of the First Amendment that require tailored solutions in lieu of across-the-board censorship. Unfortunately these bills represent terrible precedents for the United States and the world.”
 138+ </p>
 139+
 140+ <h4>Regarding Cybersecurity</h4>
 141+ <p class="quote">
 142+ “A safe and secure Web is vital to our privacy, our access to free knowledge, and to commerce. Hundreds of established authorities on the Internet believe that the required blocking of Internet sites in SOPA and PIPA is badly thought out and threatens Internet security.”
 143+ </p>
 144+</div>
 145+<div id="contacts">
 146+ <h4>Your Representatives:</h4>
130147 HTML;
131148 if ( $this->zip ) {
132 - $htmlOut .= $this->getCongressTable();
 149+ $htmlOut .= $this->getCongressTables();
133150 }
134151
135152 // Output end of the page
136 - $htmlOut .= "\n</td>\n</tr>\n</table>\n</body>\n</html>\n";
 153+ $htmlOut .= "\n</div>\n</div>\n</body>\n</html>\n";
137154
138155 echo $htmlOut;
139156
@@ -143,7 +160,7 @@
144161 * Get an HTML table of data for the user's congressional representatives
145162 * @return HTML for the table
146163 */
147 - private function getCongressTable() {
 164+ private function getCongressTables() {
148165 $myRepresentative = array();
149166 $mySenators = array();
150167 $myRepresentative = CongressLookupDB::getRepresentative( $this->zip );

Status & tagging log