Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Voting changes #2

Open
wants to merge 52 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
52 commits
Select commit Hold shift + click to select a range
3a38edf
Add static page markup and theme basic typography.
gzix Jun 10, 2011
a08829e
Merge pull request #1 from sungsit/209-theme-static-pages
johngriffin Jun 10, 2011
1c15765
Create body field markup for work_with_us page and theme its layout.
gzix Jun 10, 2011
d18b83d
Theme FAQs page.
gzix Jun 10, 2011
474050c
Finish Team, FAQ & Job description pages.
gzix Jun 10, 2011
2da3e58
Finish work_with_us page.
gzix Jun 10, 2011
b9f072f
Recreate suitable markup for Terminology lists on Accounts Expalained…
gzix Jun 11, 2011
44f0ad0
Merge pull request #2 from sungsit/209-theme-static-pages
johngriffin Jun 11, 2011
3621b04
Add glossary toggle behavior to Accounts Explianed page.
gzix Jun 12, 2011
eb320d0
Theme glossary JS block.
gzix Jun 12, 2011
8fff42d
Merge pull request #3 from sungsit/209-theme-static-pages
johngriffin Jun 12, 2011
3c3a9cf
Changed glossary block background & elaborate spacing.
gzix Jun 13, 2011
31df9c4
Merge pull request #4 from sungsit/209-theme-static-pages
johngriffin Jun 13, 2011
59919e8
Fix accounts explained js to deal with clicking on the term currently…
johngriffin Jun 13, 2011
1770098
Fixed Firefox spacing bug on Explained page.
gzix Jun 13, 2011
79f6d2e
Merge JS fix.
gzix Jun 13, 2011
a9915ab
Merge pull request #5 from sungsit/209-theme-static-pages
johngriffin Jun 13, 2011
8808f2c
Add more specific classes for those 5 static pages to prevent layout …
gzix Jun 16, 2011
f6a767e
Merge pull request #6 from sungsit/209-theme-static-pages
johngriffin Jun 16, 2011
ccfc165
remove node-contents directory that was used to hold HTML for static …
Jun 17, 2011
49edc48
Fix FF 3.6 background issue.
gzix Jun 19, 2011
ca66e13
Create basic style for user related pages.
gzix Jun 20, 2011
28310e5
Remove dirty css comments.
gzix Jun 20, 2011
ee8cb9e
Theme login-opts page.
gzix Jun 20, 2011
e76a6d0
Theme standard login page.
gzix Jun 20, 2011
36e1085
Rewrite & add level_req_login.js to theme as SAVE_PROFILE_LOGIN jquer…
gzix Jun 20, 2011
da3d564
Merge pull request #8 from sungsit/211
johngriffin Jun 20, 2011
ef88bc5
Fix dialog content typo.
gzix Jun 21, 2011
9d68a9b
Apply new sprite background to form buttons and elaborate element spa…
gzix Jun 21, 2011
e4e5a73
Theme CONNECT_ACCOUNTS_IDENTIFICATION page.
gzix Jun 21, 2011
25aeaaf
Override LinkedIn button text.
gzix Jun 21, 2011
a649e01
Theme STANDARD_LOGIN_CONNECT_ACCOUNTS & add LinkedIn account associat…
gzix Jun 22, 2011
778b22a
Add new function to handle user forms / pages / titles and cleanup du…
gzix Jun 22, 2011
98edf70
Merge pull request #9 from sungsit/211
johngriffin Jun 22, 2011
6c9aa54
Check theme form style won't affect other forms. Elaborate form typog…
gzix Jun 22, 2011
6035fd4
Merge pull request #10 from sungsit/211
johngriffin Jun 22, 2011
2dab975
Remove modal dialog for STANDARD_LOGIN_CONNECT_ACCOUNTS as discussed …
johngriffin Jun 22, 2011
278df43
Moving level_req_login.js from it's temporary home in the theme back …
johngriffin Jun 22, 2011
397478a
Moving level_req_login.js from it's temporary home in the theme back …
johngriffin Jun 22, 2011
33edbb8
Merge branch '211' of github.com:johngriffin/level-theme into 211
johngriffin Jun 22, 2011
2220a29
Any Vote basic theming.
gzix Jun 29, 2011
784f8b2
Merge pull request #11 from sungsit/213
johngriffin Jun 29, 2011
2399c38
Get all Google chart API & elaborate spacing.
gzix Jun 29, 2011
ca7724f
Merge pull request #12 from sungsit/213
johngriffin Jun 29, 2011
3fc5155
Fix star widget spacing.
gzix Jun 30, 2011
9ba7ea4
Change variables associated with any_vote commit b05db71552cede1af12f…
gzix Jun 30, 2011
e48f3a3
Refine spacing & make any_vote blocks display same style for any regi…
gzix Jun 30, 2011
3475644
Merge pull request #13 from sungsit/213
johngriffin Jun 30, 2011
0b70e36
Replace empty results (null object) to print it out as 0 (zero).
gzix Jun 30, 2011
72b5497
Fix variable typo.
gzix Jun 30, 2011
ad74cd4
Merge pull request #14 from sungsit/213
johngriffin Jun 30, 2011
2e84a95
Fix flicker whlie ajax loading.
jeremyfrench Jul 1, 2011
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
35 changes: 35 additions & 0 deletions level_omega/block-any_vote-company_payment.tpl.php
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
<?php
// Replace NULL with 0 to print out the result
?>
<?php $yes = ($block->votes['yes'] === NULL) ? 0 : $block->votes['yes']; ?>
<?php $no = ($block->votes['no'] === NULL) ? 0 : $block->votes['no']; ?>

<?php
// Title : Payment
?>
<div id="block-<?php print $block->module .'-'. $block->delta; ?>" class="block block-<?php print $block->module; print ' '; print $block->extra_classes?>">

<?php if ($block->subject): ?>
<h2><?php print $block->subject ?></h2>
<?php endif;?>

<div class="question"><?php print $block->question ?></div>

<div class="score clearfix">
<img src="https://chart.googleapis.com/chart?cht=pc&chs=115x115&chf=bg,s,f7f7f700&chco=58C327,58C327|ee3322&chd=t:-1|<?php print $yes; ?>,<?php print $no; ?>" />

<div class="widget"><?php print $block->widget ?></div>

<div class="percentage">
<?php if($block->total_votes == '0'): ?><span>--%</span><?php endif; ?>

<?php if($block->total_votes >> '0'): ?>
<span><?php print round($yes * 100 / $block->total_votes,1); ?>%</span>
<?php endif; ?>
</div>

</div>

<div class="content"><?php print $block->content ?></div>

</div>
14 changes: 14 additions & 0 deletions level_omega/block-any_vote-company_qos.tpl.php
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
<?php
// Title : Ouality of Service
?>
<div id="block-<?php print $block->module .'-'. $block->delta; ?>" class="block block-<?php print $block->module; print ' '; print $block->extra_classes?>">

<?php //if ($block->subject): ?>
<h2><?php print $block->subject ?></h2>
<?php // endif; ?>

<div class="question"><?php print $block->question ?></div>

<div class="widget clearfix"><?php print $block->widget ?></div>
<div class="content"><?php print $block->content ?></div>
</div>
41 changes: 41 additions & 0 deletions level_omega/block-any_vote-company_recommendation.tpl.php
Original file line number Diff line number Diff line change
@@ -0,0 +1,41 @@
<?php
// Replace NULL with 0 to print out the result
?>
<?php $yes = ($block->votes['yes'] === NULL) ? 0 : $block->votes['yes']; ?>
<?php $no = ($block->votes['no'] === NULL) ? 0 : $block->votes['no']; ?>

<?php
// Title : Recommendation
?>
<div id="block-<?php print $block->module .'-'. $block->delta; ?>" class="block block-<?php print $block->module; print ' '; print $block->extra_classes?>">

<?php if ($block->subject): ?>
<h2><?php print $block->subject ?></h2>
<?php endif; ?>

<div class="question"><?php print $block->question ?></div>

<div class="score">
<?php if ($block->extra_classes == 'block_has_no_votes'): ?>
<div class="content"><?php print $block->content ?></div>
<?php endif; ?>

<?php if ($block->extra_classes !== 'block_has_no_votes'): ?>
<img src="http://chart.apis.google.com/chart?cht=bvg&amp;chs=150x75&amp;chbh=56,35,0&amp;chds=a&amp;chf=bg,s,F7F7F700&amp;chxs=0,F7F7F7,0,0,_,F7F7F700&amp;chxt=y&amp;chco=58c327,ee3322&amp;chd=t:<?php print $yes; ?>|<?php print $no; ?>" />
<?php endif; ?>
</div>



<div class="widget clearfix">

<ul class="result-number">
<li class="first"><?php print $yes; ?></li>
<li class="last"><?php print $no; ?></li>
</ul>

<?php print $block->widget ?>
</div>


</div>
Loading