Merge lp:~daimoneze/osdf/wp-theme into lp:osdf/wp

Proposed by Toast McFarland
Status: Merged
Merged at revision: 12
Proposed branch: lp:~daimoneze/osdf/wp-theme
Merge into: lp:osdf/wp
Diff against target: 775 lines (+98/-274) (has conflicts)
3 files modified
header.php (+26/-0)
images/LICENSE.txt (+0/-274)
val_style.css (+72/-0)
Text conflict in header.php
To merge this branch: bzr merge lp:~daimoneze/osdf/wp-theme
Reviewer Review Type Date Requested Status
Andrew Ettinger Approve
Review via email: mp+46855@code.launchpad.net

Description of the change

Added custom custom fields for css and js. Added images and val_style.css.

To post a comment you must log in.
Revision history for this message
Andrew Ettinger (sillydeveloper) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'header.php'
2--- header.php 2011-01-12 21:05:54 +0000
3+++ header.php 2011-01-19 23:27:54 +0000
4@@ -13,6 +13,7 @@
5 <meta http-equiv="content-type" content="<?php bloginfo('html_type'); ?>; charset=<?php bloginfo('charset'); ?>" />
6
7 <link rel="stylesheet" type="text/css" href="<?php bloginfo('stylesheet_url'); ?>" />
8+<<<<<<< TREE
9
10 <script type="text/javascript">
11
12@@ -31,6 +32,31 @@
13
14 </script>
15
16+=======
17+<!-- begin -->
18+<?php
19+$id = $wp_query->post->ID;
20+$css_docs = get_post_meta($id, 'css', false);
21+$js_docs = get_post_meta($id, 'javascript', false);
22+if (!empty($css_docs))
23+{
24+ echo '<!--Custom css for '.get_the_title().'.-->'."\n";
25+ foreach ($css_docs as $css)
26+ {
27+ echo '<link rel="stylesheet" href="'.$css.'" type="text/css" media="screen" />'."\n";
28+ }
29+}
30+if (!empty($js_docs))
31+{
32+ echo '<!--Custom javascript for '.get_the_title().'.-->'."\n";
33+ foreach ($js_docs as $js)
34+ {
35+ echo '<script src="'.$js.'" type="text/javascript"></script>'."\n";
36+ }
37+}
38+?>
39+<!-- End -->
40+>>>>>>> MERGE-SOURCE
41 <?php if ( is_singular() ) wp_enqueue_script( 'comment-reply' ); ?>
42
43 <?php wp_head(); ?>
44
45=== added directory 'images'
46=== removed directory 'images'
47=== added file 'images/LICENSE.txt'
48--- images/LICENSE.txt 1970-01-01 00:00:00 +0000
49+++ images/LICENSE.txt 2011-01-19 23:27:54 +0000
50@@ -0,0 +1,274 @@
51+GNU GENERAL PUBLIC LICENSE
52+
53+ Version 2, June 1991
54+
55+Copyright (C) 1989, 1991 Free Software Foundation, Inc. 675 Mass Ave,
56+Cambridge, MA 02139, USA. Everyone is permitted to copy and distribute
57+verbatim copies of this license document, but changing it is not allowed.
58+
59+ Preamble
60+
61+The licenses for most software are designed to take away your freedom to
62+share and change it. By contrast, the GNU General Public License is
63+intended to guarantee your freedom to share and change free software--to
64+make sure the software is free for all its users. This General Public License
65+applies to most of the Free Software Foundation's software and to any other
66+program whose authors commit to using it. (Some other Free Software
67+Foundation software is covered by the GNU Library General Public License
68+instead.) You can apply it to your programs, too.
69+
70+When we speak of free software, we are referring to freedom, not price. Our
71+General Public Licenses are designed to make sure that you have the
72+freedom to distribute copies of free software (and charge for this service if
73+you wish), that you receive source code or can get it if you want it, that you
74+can change the software or use pieces of it in new free programs; and that
75+you know you can do these things.
76+
77+To protect your rights, we need to make restrictions that forbid anyone to
78+deny you these rights or to ask you to surrender the rights. These restrictions
79+translate to certain responsibilities for you if you distribute copies of the
80+software, or if you modify it.
81+
82+For example, if you distribute copies of such a program, whether gratis or for
83+a fee, you must give the recipients all the rights that you have. You must make
84+sure that they, too, receive or can get the source code. And you must show
85+them these terms so they know their rights.
86+
87+We protect your rights with two steps: (1) copyright the software, and (2)
88+offer you this license which gives you legal permission to copy, distribute
89+and/or modify the software.
90+
91+Also, for each author's protection and ours, we want to make certain that
92+everyone understands that there is no warranty for this free software. If the
93+software is modified by someone else and passed on, we want its recipients
94+to know that what they have is not the original, so that any problems
95+introduced by others will not reflect on the original authors' reputations.
96+
97+Finally, any free program is threatened constantly by software patents. We
98+wish to avoid the danger that redistributors of a free program will individually
99+obtain patent licenses, in effect making the program proprietary. To prevent
100+this, we have made it clear that any patent must be licensed for everyone's
101+free use or not licensed at all.
102+
103+The precise terms and conditions for copying, distribution and modification
104+follow.
105+
106+ GNU GENERAL PUBLIC LICENSE
107+ TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND
108+ MODIFICATION
109+
110+0. This License applies to any program or other work which contains a notice
111+placed by the copyright holder saying it may be distributed under the terms
112+of this General Public License. The "Program", below, refers to any such
113+program or work, and a "work based on the Program" means either the
114+Program or any derivative work under copyright law: that is to say, a work
115+containing the Program or a portion of it, either verbatim or with
116+modifications and/or translated into another language. (Hereinafter, translation
117+is included without limitation in the term "modification".) Each licensee is
118+addressed as "you".
119+
120+Activities other than copying, distribution and modification are not covered
121+by this License; they are outside its scope. The act of running the Program is
122+not restricted, and the output from the Program is covered only if its contents
123+constitute a work based on the Program (independent of having been made
124+by running the Program). Whether that is true depends on what the Program
125+does.
126+
127+1. You may copy and distribute verbatim copies of the Program's source
128+code as you receive it, in any medium, provided that you conspicuously and
129+appropriately publish on each copy an appropriate copyright notice and
130+disclaimer of warranty; keep intact all the notices that refer to this License
131+and to the absence of any warranty; and give any other recipients of the
132+Program a copy of this License along with the Program.
133+
134+You may charge a fee for the physical act of transferring a copy, and you
135+may at your option offer warranty protection in exchange for a fee.
136+
137+2. You may modify your copy or copies of the Program or any portion of it,
138+thus forming a work based on the Program, and copy and distribute such
139+modifications or work under the terms of Section 1 above, provided that you
140+also meet all of these conditions:
141+
142+a) You must cause the modified files to carry prominent notices stating that
143+you changed the files and the date of any change.
144+
145+b) You must cause any work that you distribute or publish, that in whole or in
146+part contains or is derived from the Program or any part thereof, to be
147+licensed as a whole at no charge to all third parties under the terms of this
148+License.
149+
150+c) If the modified program normally reads commands interactively when run,
151+you must cause it, when started running for such interactive use in the most
152+ordinary way, to print or display an announcement including an appropriate
153+copyright notice and a notice that there is no warranty (or else, saying that
154+you provide a warranty) and that users may redistribute the program under
155+these conditions, and telling the user how to view a copy of this License.
156+(Exception: if the Program itself is interactive but does not normally print such
157+an announcement, your work based on the Program is not required to print
158+an announcement.)
159+
160+These requirements apply to the modified work as a whole. If identifiable
161+sections of that work are not derived from the Program, and can be
162+reasonably considered independent and separate works in themselves, then
163+this License, and its terms, do not apply to those sections when you distribute
164+them as separate works. But when you distribute the same sections as part
165+of a whole which is a work based on the Program, the distribution of the
166+whole must be on the terms of this License, whose permissions for other
167+licensees extend to the entire whole, and thus to each and every part
168+regardless of who wrote it.
169+
170+Thus, it is not the intent of this section to claim rights or contest your rights to
171+work written entirely by you; rather, the intent is to exercise the right to
172+control the distribution of derivative or collective works based on the
173+Program.
174+
175+In addition, mere aggregation of another work not based on the Program
176+with the Program (or with a work based on the Program) on a volume of a
177+storage or distribution medium does not bring the other work under the scope
178+of this License.
179+
180+3. You may copy and distribute the Program (or a work based on it, under
181+Section 2) in object code or executable form under the terms of Sections 1
182+and 2 above provided that you also do one of the following:
183+
184+a) Accompany it with the complete corresponding machine-readable source
185+code, which must be distributed under the terms of Sections 1 and 2 above
186+on a medium customarily used for software interchange; or,
187+
188+b) Accompany it with a written offer, valid for at least three years, to give
189+any third party, for a charge no more than your cost of physically performing
190+source distribution, a complete machine-readable copy of the corresponding
191+source code, to be distributed under the terms of Sections 1 and 2 above on
192+a medium customarily used for software interchange; or,
193+
194+c) Accompany it with the information you received as to the offer to distribute
195+corresponding source code. (This alternative is allowed only for
196+noncommercial distribution and only if you received the program in object
197+code or executable form with such an offer, in accord with Subsection b
198+above.)
199+
200+The source code for a work means the preferred form of the work for
201+making modifications to it. For an executable work, complete source code
202+means all the source code for all modules it contains, plus any associated
203+interface definition files, plus the scripts used to control compilation and
204+installation of the executable. However, as a special exception, the source
205+code distributed need not include anything that is normally distributed (in
206+either source or binary form) with the major components (compiler, kernel,
207+and so on) of the operating system on which the executable runs, unless that
208+component itself accompanies the executable.
209+
210+If distribution of executable or object code is made by offering access to
211+copy from a designated place, then offering equivalent access to copy the
212+source code from the same place counts as distribution of the source code,
213+even though third parties are not compelled to copy the source along with the
214+object code.
215+
216+4. You may not copy, modify, sublicense, or distribute the Program except as
217+expressly provided under this License. Any attempt otherwise to copy,
218+modify, sublicense or distribute the Program is void, and will automatically
219+terminate your rights under this License. However, parties who have received
220+copies, or rights, from you under this License will not have their licenses
221+terminated so long as such parties remain in full compliance.
222+
223+5. You are not required to accept this License, since you have not signed it.
224+However, nothing else grants you permission to modify or distribute the
225+Program or its derivative works. These actions are prohibited by law if you
226+do not accept this License. Therefore, by modifying or distributing the
227+Program (or any work based on the Program), you indicate your acceptance
228+of this License to do so, and all its terms and conditions for copying,
229+distributing or modifying the Program or works based on it.
230+
231+6. Each time you redistribute the Program (or any work based on the
232+Program), the recipient automatically receives a license from the original
233+licensor to copy, distribute or modify the Program subject to these terms and
234+conditions. You may not impose any further restrictions on the recipients'
235+exercise of the rights granted herein. You are not responsible for enforcing
236+compliance by third parties to this License.
237+
238+7. If, as a consequence of a court judgment or allegation of patent
239+infringement or for any other reason (not limited to patent issues), conditions
240+are imposed on you (whether by court order, agreement or otherwise) that
241+contradict the conditions of this License, they do not excuse you from the
242+conditions of this License. If you cannot distribute so as to satisfy
243+simultaneously your obligations under this License and any other pertinent
244+obligations, then as a consequence you may not distribute the Program at all.
245+For example, if a patent license would not permit royalty-free redistribution
246+of the Program by all those who receive copies directly or indirectly through
247+you, then the only way you could satisfy both it and this License would be to
248+refrain entirely from distribution of the Program.
249+
250+If any portion of this section is held invalid or unenforceable under any
251+particular circumstance, the balance of the section is intended to apply and
252+the section as a whole is intended to apply in other circumstances.
253+
254+It is not the purpose of this section to induce you to infringe any patents or
255+other property right claims or to contest validity of any such claims; this
256+section has the sole purpose of protecting the integrity of the free software
257+distribution system, which is implemented by public license practices. Many
258+people have made generous contributions to the wide range of software
259+distributed through that system in reliance on consistent application of that
260+system; it is up to the author/donor to decide if he or she is willing to
261+distribute software through any other system and a licensee cannot impose
262+that choice.
263+
264+This section is intended to make thoroughly clear what is believed to be a
265+consequence of the rest of this License.
266+
267+8. If the distribution and/or use of the Program is restricted in certain
268+countries either by patents or by copyrighted interfaces, the original copyright
269+holder who places the Program under this License may add an explicit
270+geographical distribution limitation excluding those countries, so that
271+distribution is permitted only in or among countries not thus excluded. In such
272+case, this License incorporates the limitation as if written in the body of this
273+License.
274+
275+9. The Free Software Foundation may publish revised and/or new versions
276+of the General Public License from time to time. Such new versions will be
277+similar in spirit to the present version, but may differ in detail to address new
278+problems or concerns.
279+
280+Each version is given a distinguishing version number. If the Program specifies
281+a version number of this License which applies to it and "any later version",
282+you have the option of following the terms and conditions either of that
283+version or of any later version published by the Free Software Foundation. If
284+the Program does not specify a version number of this License, you may
285+choose any version ever published by the Free Software Foundation.
286+
287+10. If you wish to incorporate parts of the Program into other free programs
288+whose distribution conditions are different, write to the author to ask for
289+permission. For software which is copyrighted by the Free Software
290+Foundation, write to the Free Software Foundation; we sometimes make
291+exceptions for this. Our decision will be guided by the two goals of
292+preserving the free status of all derivatives of our free software and of
293+promoting the sharing and reuse of software generally.
294+
295+ NO WARRANTY
296+
297+11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE,
298+THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT
299+PERMITTED BY APPLICABLE LAW. EXCEPT WHEN OTHERWISE
300+STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR
301+OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT
302+WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED,
303+INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
304+OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
305+PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND
306+PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE
307+PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL
308+NECESSARY SERVICING, REPAIR OR CORRECTION.
309+
310+12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR
311+AGREED TO IN WRITING WILL ANY COPYRIGHT HOLDER, OR
312+ANY OTHER PARTY WHO MAY MODIFY AND/OR
313+REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE
314+LIABLE TO YOU FOR DAMAGES, INCLUDING ANY GENERAL,
315+SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES
316+ARISING OUT OF THE USE OR INABILITY TO USE THE
317+PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF DATA
318+OR DATA BEING RENDERED INACCURATE OR LOSSES
319+SUSTAINED BY YOU OR THIRD PARTIES OR A FAILURE OF THE
320+PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), EVEN
321+IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF
322+THE POSSIBILITY OF SUCH DAMAGES.
323+
324+ END OF TERMS AND CONDITIONS
325
326=== removed file 'images/LICENSE.txt'
327--- images/LICENSE.txt 2010-12-11 00:18:21 +0000
328+++ images/LICENSE.txt 1970-01-01 00:00:00 +0000
329@@ -1,274 +0,0 @@
330-GNU GENERAL PUBLIC LICENSE
331-
332- Version 2, June 1991
333-
334-Copyright (C) 1989, 1991 Free Software Foundation, Inc. 675 Mass Ave,
335-Cambridge, MA 02139, USA. Everyone is permitted to copy and distribute
336-verbatim copies of this license document, but changing it is not allowed.
337-
338- Preamble
339-
340-The licenses for most software are designed to take away your freedom to
341-share and change it. By contrast, the GNU General Public License is
342-intended to guarantee your freedom to share and change free software--to
343-make sure the software is free for all its users. This General Public License
344-applies to most of the Free Software Foundation's software and to any other
345-program whose authors commit to using it. (Some other Free Software
346-Foundation software is covered by the GNU Library General Public License
347-instead.) You can apply it to your programs, too.
348-
349-When we speak of free software, we are referring to freedom, not price. Our
350-General Public Licenses are designed to make sure that you have the
351-freedom to distribute copies of free software (and charge for this service if
352-you wish), that you receive source code or can get it if you want it, that you
353-can change the software or use pieces of it in new free programs; and that
354-you know you can do these things.
355-
356-To protect your rights, we need to make restrictions that forbid anyone to
357-deny you these rights or to ask you to surrender the rights. These restrictions
358-translate to certain responsibilities for you if you distribute copies of the
359-software, or if you modify it.
360-
361-For example, if you distribute copies of such a program, whether gratis or for
362-a fee, you must give the recipients all the rights that you have. You must make
363-sure that they, too, receive or can get the source code. And you must show
364-them these terms so they know their rights.
365-
366-We protect your rights with two steps: (1) copyright the software, and (2)
367-offer you this license which gives you legal permission to copy, distribute
368-and/or modify the software.
369-
370-Also, for each author's protection and ours, we want to make certain that
371-everyone understands that there is no warranty for this free software. If the
372-software is modified by someone else and passed on, we want its recipients
373-to know that what they have is not the original, so that any problems
374-introduced by others will not reflect on the original authors' reputations.
375-
376-Finally, any free program is threatened constantly by software patents. We
377-wish to avoid the danger that redistributors of a free program will individually
378-obtain patent licenses, in effect making the program proprietary. To prevent
379-this, we have made it clear that any patent must be licensed for everyone's
380-free use or not licensed at all.
381-
382-The precise terms and conditions for copying, distribution and modification
383-follow.
384-
385- GNU GENERAL PUBLIC LICENSE
386- TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND
387- MODIFICATION
388-
389-0. This License applies to any program or other work which contains a notice
390-placed by the copyright holder saying it may be distributed under the terms
391-of this General Public License. The "Program", below, refers to any such
392-program or work, and a "work based on the Program" means either the
393-Program or any derivative work under copyright law: that is to say, a work
394-containing the Program or a portion of it, either verbatim or with
395-modifications and/or translated into another language. (Hereinafter, translation
396-is included without limitation in the term "modification".) Each licensee is
397-addressed as "you".
398-
399-Activities other than copying, distribution and modification are not covered
400-by this License; they are outside its scope. The act of running the Program is
401-not restricted, and the output from the Program is covered only if its contents
402-constitute a work based on the Program (independent of having been made
403-by running the Program). Whether that is true depends on what the Program
404-does.
405-
406-1. You may copy and distribute verbatim copies of the Program's source
407-code as you receive it, in any medium, provided that you conspicuously and
408-appropriately publish on each copy an appropriate copyright notice and
409-disclaimer of warranty; keep intact all the notices that refer to this License
410-and to the absence of any warranty; and give any other recipients of the
411-Program a copy of this License along with the Program.
412-
413-You may charge a fee for the physical act of transferring a copy, and you
414-may at your option offer warranty protection in exchange for a fee.
415-
416-2. You may modify your copy or copies of the Program or any portion of it,
417-thus forming a work based on the Program, and copy and distribute such
418-modifications or work under the terms of Section 1 above, provided that you
419-also meet all of these conditions:
420-
421-a) You must cause the modified files to carry prominent notices stating that
422-you changed the files and the date of any change.
423-
424-b) You must cause any work that you distribute or publish, that in whole or in
425-part contains or is derived from the Program or any part thereof, to be
426-licensed as a whole at no charge to all third parties under the terms of this
427-License.
428-
429-c) If the modified program normally reads commands interactively when run,
430-you must cause it, when started running for such interactive use in the most
431-ordinary way, to print or display an announcement including an appropriate
432-copyright notice and a notice that there is no warranty (or else, saying that
433-you provide a warranty) and that users may redistribute the program under
434-these conditions, and telling the user how to view a copy of this License.
435-(Exception: if the Program itself is interactive but does not normally print such
436-an announcement, your work based on the Program is not required to print
437-an announcement.)
438-
439-These requirements apply to the modified work as a whole. If identifiable
440-sections of that work are not derived from the Program, and can be
441-reasonably considered independent and separate works in themselves, then
442-this License, and its terms, do not apply to those sections when you distribute
443-them as separate works. But when you distribute the same sections as part
444-of a whole which is a work based on the Program, the distribution of the
445-whole must be on the terms of this License, whose permissions for other
446-licensees extend to the entire whole, and thus to each and every part
447-regardless of who wrote it.
448-
449-Thus, it is not the intent of this section to claim rights or contest your rights to
450-work written entirely by you; rather, the intent is to exercise the right to
451-control the distribution of derivative or collective works based on the
452-Program.
453-
454-In addition, mere aggregation of another work not based on the Program
455-with the Program (or with a work based on the Program) on a volume of a
456-storage or distribution medium does not bring the other work under the scope
457-of this License.
458-
459-3. You may copy and distribute the Program (or a work based on it, under
460-Section 2) in object code or executable form under the terms of Sections 1
461-and 2 above provided that you also do one of the following:
462-
463-a) Accompany it with the complete corresponding machine-readable source
464-code, which must be distributed under the terms of Sections 1 and 2 above
465-on a medium customarily used for software interchange; or,
466-
467-b) Accompany it with a written offer, valid for at least three years, to give
468-any third party, for a charge no more than your cost of physically performing
469-source distribution, a complete machine-readable copy of the corresponding
470-source code, to be distributed under the terms of Sections 1 and 2 above on
471-a medium customarily used for software interchange; or,
472-
473-c) Accompany it with the information you received as to the offer to distribute
474-corresponding source code. (This alternative is allowed only for
475-noncommercial distribution and only if you received the program in object
476-code or executable form with such an offer, in accord with Subsection b
477-above.)
478-
479-The source code for a work means the preferred form of the work for
480-making modifications to it. For an executable work, complete source code
481-means all the source code for all modules it contains, plus any associated
482-interface definition files, plus the scripts used to control compilation and
483-installation of the executable. However, as a special exception, the source
484-code distributed need not include anything that is normally distributed (in
485-either source or binary form) with the major components (compiler, kernel,
486-and so on) of the operating system on which the executable runs, unless that
487-component itself accompanies the executable.
488-
489-If distribution of executable or object code is made by offering access to
490-copy from a designated place, then offering equivalent access to copy the
491-source code from the same place counts as distribution of the source code,
492-even though third parties are not compelled to copy the source along with the
493-object code.
494-
495-4. You may not copy, modify, sublicense, or distribute the Program except as
496-expressly provided under this License. Any attempt otherwise to copy,
497-modify, sublicense or distribute the Program is void, and will automatically
498-terminate your rights under this License. However, parties who have received
499-copies, or rights, from you under this License will not have their licenses
500-terminated so long as such parties remain in full compliance.
501-
502-5. You are not required to accept this License, since you have not signed it.
503-However, nothing else grants you permission to modify or distribute the
504-Program or its derivative works. These actions are prohibited by law if you
505-do not accept this License. Therefore, by modifying or distributing the
506-Program (or any work based on the Program), you indicate your acceptance
507-of this License to do so, and all its terms and conditions for copying,
508-distributing or modifying the Program or works based on it.
509-
510-6. Each time you redistribute the Program (or any work based on the
511-Program), the recipient automatically receives a license from the original
512-licensor to copy, distribute or modify the Program subject to these terms and
513-conditions. You may not impose any further restrictions on the recipients'
514-exercise of the rights granted herein. You are not responsible for enforcing
515-compliance by third parties to this License.
516-
517-7. If, as a consequence of a court judgment or allegation of patent
518-infringement or for any other reason (not limited to patent issues), conditions
519-are imposed on you (whether by court order, agreement or otherwise) that
520-contradict the conditions of this License, they do not excuse you from the
521-conditions of this License. If you cannot distribute so as to satisfy
522-simultaneously your obligations under this License and any other pertinent
523-obligations, then as a consequence you may not distribute the Program at all.
524-For example, if a patent license would not permit royalty-free redistribution
525-of the Program by all those who receive copies directly or indirectly through
526-you, then the only way you could satisfy both it and this License would be to
527-refrain entirely from distribution of the Program.
528-
529-If any portion of this section is held invalid or unenforceable under any
530-particular circumstance, the balance of the section is intended to apply and
531-the section as a whole is intended to apply in other circumstances.
532-
533-It is not the purpose of this section to induce you to infringe any patents or
534-other property right claims or to contest validity of any such claims; this
535-section has the sole purpose of protecting the integrity of the free software
536-distribution system, which is implemented by public license practices. Many
537-people have made generous contributions to the wide range of software
538-distributed through that system in reliance on consistent application of that
539-system; it is up to the author/donor to decide if he or she is willing to
540-distribute software through any other system and a licensee cannot impose
541-that choice.
542-
543-This section is intended to make thoroughly clear what is believed to be a
544-consequence of the rest of this License.
545-
546-8. If the distribution and/or use of the Program is restricted in certain
547-countries either by patents or by copyrighted interfaces, the original copyright
548-holder who places the Program under this License may add an explicit
549-geographical distribution limitation excluding those countries, so that
550-distribution is permitted only in or among countries not thus excluded. In such
551-case, this License incorporates the limitation as if written in the body of this
552-License.
553-
554-9. The Free Software Foundation may publish revised and/or new versions
555-of the General Public License from time to time. Such new versions will be
556-similar in spirit to the present version, but may differ in detail to address new
557-problems or concerns.
558-
559-Each version is given a distinguishing version number. If the Program specifies
560-a version number of this License which applies to it and "any later version",
561-you have the option of following the terms and conditions either of that
562-version or of any later version published by the Free Software Foundation. If
563-the Program does not specify a version number of this License, you may
564-choose any version ever published by the Free Software Foundation.
565-
566-10. If you wish to incorporate parts of the Program into other free programs
567-whose distribution conditions are different, write to the author to ask for
568-permission. For software which is copyrighted by the Free Software
569-Foundation, write to the Free Software Foundation; we sometimes make
570-exceptions for this. Our decision will be guided by the two goals of
571-preserving the free status of all derivatives of our free software and of
572-promoting the sharing and reuse of software generally.
573-
574- NO WARRANTY
575-
576-11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE,
577-THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT
578-PERMITTED BY APPLICABLE LAW. EXCEPT WHEN OTHERWISE
579-STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR
580-OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT
581-WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED,
582-INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
583-OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
584-PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND
585-PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE
586-PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL
587-NECESSARY SERVICING, REPAIR OR CORRECTION.
588-
589-12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR
590-AGREED TO IN WRITING WILL ANY COPYRIGHT HOLDER, OR
591-ANY OTHER PARTY WHO MAY MODIFY AND/OR
592-REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE
593-LIABLE TO YOU FOR DAMAGES, INCLUDING ANY GENERAL,
594-SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES
595-ARISING OUT OF THE USE OR INABILITY TO USE THE
596-PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF DATA
597-OR DATA BEING RENDERED INACCURATE OR LOSSES
598-SUSTAINED BY YOU OR THIRD PARTIES OR A FAILURE OF THE
599-PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), EVEN
600-IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF
601-THE POSSIBILITY OF SUCH DAMAGES.
602-
603- END OF TERMS AND CONDITIONS
604
605=== added file 'images/bg.jpg'
606Binary files images/bg.jpg 1970-01-01 00:00:00 +0000 and images/bg.jpg 2011-01-19 23:27:54 +0000 differ
607=== removed file 'images/bg.jpg'
608Binary files images/bg.jpg 2010-12-11 00:18:21 +0000 and images/bg.jpg 1970-01-01 00:00:00 +0000 differ
609=== added file 'images/box_bg.gif'
610Binary files images/box_bg.gif 1970-01-01 00:00:00 +0000 and images/box_bg.gif 2011-01-19 23:27:54 +0000 differ
611=== removed file 'images/box_bg.gif'
612Binary files images/box_bg.gif 2010-12-11 00:18:21 +0000 and images/box_bg.gif 1970-01-01 00:00:00 +0000 differ
613=== added file 'images/bt_bg.gif'
614Binary files images/bt_bg.gif 1970-01-01 00:00:00 +0000 and images/bt_bg.gif 2011-01-19 23:27:54 +0000 differ
615=== removed file 'images/bt_bg.gif'
616Binary files images/bt_bg.gif 2010-12-11 00:18:21 +0000 and images/bt_bg.gif 1970-01-01 00:00:00 +0000 differ
617=== added file 'images/calendar_icon.gif'
618Binary files images/calendar_icon.gif 1970-01-01 00:00:00 +0000 and images/calendar_icon.gif 2011-01-19 23:27:54 +0000 differ
619=== removed file 'images/calendar_icon.gif'
620Binary files images/calendar_icon.gif 2010-12-11 00:18:21 +0000 and images/calendar_icon.gif 1970-01-01 00:00:00 +0000 differ
621=== added file 'images/center_bg.gif'
622Binary files images/center_bg.gif 1970-01-01 00:00:00 +0000 and images/center_bg.gif 2011-01-19 23:27:54 +0000 differ
623=== removed file 'images/center_bg.gif'
624Binary files images/center_bg.gif 2010-12-11 00:18:21 +0000 and images/center_bg.gif 1970-01-01 00:00:00 +0000 differ
625=== added file 'images/clients_icon.gif'
626Binary files images/clients_icon.gif 1970-01-01 00:00:00 +0000 and images/clients_icon.gif 2011-01-19 23:27:54 +0000 differ
627=== removed file 'images/clients_icon.gif'
628Binary files images/clients_icon.gif 2010-12-11 00:18:21 +0000 and images/clients_icon.gif 1970-01-01 00:00:00 +0000 differ
629=== added file 'images/donate.jpg'
630Binary files images/donate.jpg 1970-01-01 00:00:00 +0000 and images/donate.jpg 2011-01-19 23:27:54 +0000 differ
631=== removed file 'images/donate.jpg'
632Binary files images/donate.jpg 2010-12-11 00:18:21 +0000 and images/donate.jpg 1970-01-01 00:00:00 +0000 differ
633=== added file 'images/footer_logo.gif'
634Binary files images/footer_logo.gif 1970-01-01 00:00:00 +0000 and images/footer_logo.gif 2011-01-19 23:27:54 +0000 differ
635=== removed file 'images/footer_logo.gif'
636Binary files images/footer_logo.gif 2010-12-11 00:18:21 +0000 and images/footer_logo.gif 1970-01-01 00:00:00 +0000 differ
637=== added file 'images/header_bg.jpg'
638Binary files images/header_bg.jpg 1970-01-01 00:00:00 +0000 and images/header_bg.jpg 2011-01-19 23:27:54 +0000 differ
639=== removed file 'images/header_bg.jpg'
640Binary files images/header_bg.jpg 2010-12-11 00:18:21 +0000 and images/header_bg.jpg 1970-01-01 00:00:00 +0000 differ
641=== added file 'images/home_arrow.gif'
642Binary files images/home_arrow.gif 1970-01-01 00:00:00 +0000 and images/home_arrow.gif 2011-01-19 23:27:54 +0000 differ
643=== removed file 'images/home_arrow.gif'
644Binary files images/home_arrow.gif 2010-12-11 00:18:21 +0000 and images/home_arrow.gif 1970-01-01 00:00:00 +0000 differ
645=== added file 'images/icon1.png'
646Binary files images/icon1.png 1970-01-01 00:00:00 +0000 and images/icon1.png 2011-01-19 23:27:54 +0000 differ
647=== removed file 'images/icon1.png'
648Binary files images/icon1.png 2010-12-11 00:18:21 +0000 and images/icon1.png 1970-01-01 00:00:00 +0000 differ
649=== added file 'images/icon2.png'
650Binary files images/icon2.png 1970-01-01 00:00:00 +0000 and images/icon2.png 2011-01-19 23:27:54 +0000 differ
651=== removed file 'images/icon2.png'
652Binary files images/icon2.png 2010-12-11 00:18:21 +0000 and images/icon2.png 1970-01-01 00:00:00 +0000 differ
653=== added file 'images/icon3.png'
654Binary files images/icon3.png 1970-01-01 00:00:00 +0000 and images/icon3.png 2011-01-19 23:27:54 +0000 differ
655=== removed file 'images/icon3.png'
656Binary files images/icon3.png 2010-12-11 00:18:21 +0000 and images/icon3.png 1970-01-01 00:00:00 +0000 differ
657=== added file 'images/list_arrow.gif'
658Binary files images/list_arrow.gif 1970-01-01 00:00:00 +0000 and images/list_arrow.gif 2011-01-19 23:27:54 +0000 differ
659=== removed file 'images/list_arrow.gif'
660Binary files images/list_arrow.gif 2010-12-11 00:18:21 +0000 and images/list_arrow.gif 1970-01-01 00:00:00 +0000 differ
661=== added file 'images/logo - Copy.png'
662Binary files images/logo - Copy.png 1970-01-01 00:00:00 +0000 and images/logo - Copy.png 2011-01-19 23:27:54 +0000 differ
663=== removed file 'images/logo - Copy.png'
664Binary files images/logo - Copy.png 2010-12-11 00:18:21 +0000 and images/logo - Copy.png 1970-01-01 00:00:00 +0000 differ
665=== added file 'images/logo.png'
666Binary files images/logo.png 1970-01-01 00:00:00 +0000 and images/logo.png 2011-01-19 23:27:54 +0000 differ
667=== removed file 'images/logo.png'
668Binary files images/logo.png 2010-12-11 00:18:21 +0000 and images/logo.png 1970-01-01 00:00:00 +0000 differ
669=== added file 'images/logo2.png'
670Binary files images/logo2.png 1970-01-01 00:00:00 +0000 and images/logo2.png 2011-01-19 23:27:54 +0000 differ
671=== removed file 'images/logo2.png'
672Binary files images/logo2.png 2010-12-11 00:18:21 +0000 and images/logo2.png 1970-01-01 00:00:00 +0000 differ
673=== added file 'images/new_logo.jpg'
674Binary files images/new_logo.jpg 1970-01-01 00:00:00 +0000 and images/new_logo.jpg 2011-01-19 23:27:54 +0000 differ
675=== added file 'images/phone_arrows.png'
676Binary files images/phone_arrows.png 1970-01-01 00:00:00 +0000 and images/phone_arrows.png 2011-01-19 23:27:54 +0000 differ
677=== removed file 'images/phone_arrows.png'
678Binary files images/phone_arrows.png 2010-12-11 00:18:21 +0000 and images/phone_arrows.png 1970-01-01 00:00:00 +0000 differ
679=== added file 'images/read_more_bg.gif'
680Binary files images/read_more_bg.gif 1970-01-01 00:00:00 +0000 and images/read_more_bg.gif 2011-01-19 23:27:54 +0000 differ
681=== removed file 'images/read_more_bg.gif'
682Binary files images/read_more_bg.gif 2010-12-11 00:18:21 +0000 and images/read_more_bg.gif 1970-01-01 00:00:00 +0000 differ
683=== added file 'images/services.gif'
684Binary files images/services.gif 1970-01-01 00:00:00 +0000 and images/services.gif 2011-01-19 23:27:54 +0000 differ
685=== removed file 'images/services.gif'
686Binary files images/services.gif 2010-12-11 00:18:21 +0000 and images/services.gif 1970-01-01 00:00:00 +0000 differ
687=== added file 'images/subtitle1.gif'
688Binary files images/subtitle1.gif 1970-01-01 00:00:00 +0000 and images/subtitle1.gif 2011-01-19 23:27:54 +0000 differ
689=== removed file 'images/subtitle1.gif'
690Binary files images/subtitle1.gif 2010-12-11 00:18:21 +0000 and images/subtitle1.gif 1970-01-01 00:00:00 +0000 differ
691=== added file 'images/the_love_birds.jpg'
692Binary files images/the_love_birds.jpg 1970-01-01 00:00:00 +0000 and images/the_love_birds.jpg 2011-01-19 23:27:54 +0000 differ
693=== added file 'images/valentine.jpg'
694Binary files images/valentine.jpg 1970-01-01 00:00:00 +0000 and images/valentine.jpg 2011-01-19 23:27:54 +0000 differ
695=== added file 'images/valentine_header.jpg'
696Binary files images/valentine_header.jpg 1970-01-01 00:00:00 +0000 and images/valentine_header.jpg 2011-01-19 23:27:54 +0000 differ
697=== added file 'images/valentines_banner.jpg'
698Binary files images/valentines_banner.jpg 1970-01-01 00:00:00 +0000 and images/valentines_banner.jpg 2011-01-19 23:27:54 +0000 differ
699=== added file 'val_style.css'
700--- val_style.css 1970-01-01 00:00:00 +0000
701+++ val_style.css 2011-01-19 23:27:54 +0000
702@@ -0,0 +1,72 @@
703+/* Valentines Day style sheet.
704+ Created by Toast McFarland and Andrew Ettinger for The OSDF.
705+ Freedom ain't really free, now is it?
706+*/
707+body{
708+ padding:0;
709+ margin:0;
710+}
711+#wrapper{
712+ margin:0 auto 0 auto;
713+ width:936px;
714+ background:#66668A;
715+}
716+#head{
717+ background:url(images/valentine_header.jpg) no-repeat;
718+ width:100%;
719+ height:155px;
720+ margin: 0 auto;
721+}
722+#main{
723+ width:100%;
724+ margin: auto;
725+}
726+.content_wrap{
727+ background:url(images/valentines_banner.jpg) no-repeat 12px 20px #fff;
728+ margin:5px auto;
729+ width:766px;
730+ border:1px solid;
731+ position:relative;
732+}
733+div#senators{
734+ margin:0 auto 0;
735+ width:550px;
736+ background:url(images/the_love_birds.jpg) no-repeat 0 0;
737+ height:336px;
738+ width:550px;
739+}
740+img#love_birds{
741+ width:550px;
742+}
743+#content_left{
744+ float: left;
745+ width:43%;
746+ padding-left:47px;
747+}
748+#content_right{
749+ float: right;
750+ width:42%;
751+ padding-top: 20px;
752+}
753+div#content_left h3{
754+ color:red;
755+}
756+#footer{
757+ margin:0 auto;
758+}
759+ul.footer{
760+ list-style-type:none;
761+ text-align:center;
762+}
763+li.footer{
764+ display:inline;
765+ width:auto;
766+ border-right:solid 1px;
767+ padding:0 10px;
768+}
769+li.footer_last{
770+ border:none;
771+ padding:0 10px;
772+ display:inline;
773+ width:auto;
774+}
775\ No newline at end of file

Subscribers

People subscribed via source and target branches