Skip to content

Commit

Permalink
mnn
Browse files Browse the repository at this point in the history
  • Loading branch information
ruthdelcampo committed Mar 28, 2012
1 parent c755d7f commit 7e9bc30
Show file tree
Hide file tree
Showing 20 changed files with 106 additions and 8 deletions.
1 change: 1 addition & 0 deletions app/controllers/organizations_controller.rb
Expand Up @@ -5,6 +5,7 @@ class OrganizationsController < ApplicationController
#----------------------------------------------------------------------

def index
# just a list of selected organizations using openaid
# @organizations = ...
end

Expand Down
30 changes: 26 additions & 4 deletions app/views/organizations/index.html.erb
@@ -1,6 +1,7 @@
<div class="logo">
<h1>
<a href="/organizations" title="openAid Organizations">Organizations</a><img src="/images/plus_icon.png" alt="" class="rit png" />
<a href="/organizations" title="openAid Organizations">Organizations</a>
<img src="/images/plus_icon.png" alt="" class="png" style="right:100px;" />
</h1>
</div>

Expand All @@ -11,9 +12,30 @@
<div id="body_container">
<div class="sign_sec">
<div class="sign_left">
<div class="organizations_list">
main
</div>
<form action="#" method="post" style="margin-top:6px;padding:30px 10px 10px 30px;">
<div id="organizations_list">

<ul>
<li><a href="" target="_blank" class="adra"></a></li>
<li><a href="" target="_blank" class="adb"></a></li>
<li><a href="" target="_blank" class="alliance"></a></li>
<li><a href="" target="_blank" class="hewlett"></a></li>
<li><a href="" target="_blank" class="unops"></a></li>
<li><a href="" target="_blank" class="undp"></a></li>
<li><a href="" target="_blank" class="spark"></a></li>
<li><a href="" target="_blank" class="rem"></a></li>
<li><a href="" target="_blank" class="progressio"></a></li>
<li><a href="" target="_blank" class="oxfam"></a></li>
<li><a href="" target="_blank" class="publish"></a></li>
<li><a href="" target="_blank" class="indigo"></a></li>
<li><a href="" target="_blank" class="globalfund"></a></li>
<li><a href="" target="_blank" class="engineerswithoutborders"></a></li>
<li><a href="" target="_blank" class="developmentinitiatives"></a></li>
<li><a href="" target="_blank" class="cafod"></a></li>
</ul>

</div>
</form>
</div>

<div class="dashboard_right">
Expand Down
4 changes: 2 additions & 2 deletions app/views/pages/faq.html.erb
@@ -1,7 +1,7 @@
<div class="logo">
<h1 class="wid">
<a href="/faq" title="openAid FAQ">F.A.Q</a>
<img src="/images/plus_icon.png" alt="" class=" rit5 png">
<img src="/images/plus_icon.png" alt="" class="png" style="right:640px;"/>
</h1>
</div>

Expand All @@ -25,7 +25,7 @@
<li><a href="#faq5">5. HOW DOES CITIZENS IN DEVELOPING NATIONS BENEFIT FROM OAR? </a></li>
<li><a href="#faq6">6. HOW DOES RESEARCHERS BENEFIT FROM OAR?</a></li>
<li><a href="#faq7">7. CAN I COLLABORATE?</a></li>

</ul>

<div>
Expand Down
Binary file added public/images/organization-logos/adb.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added public/images/organization-logos/adrauk.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added public/images/organization-logos/alliance.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added public/images/organization-logos/cafod.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added public/images/organization-logos/globalfund.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added public/images/organization-logos/hewlett.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added public/images/organization-logos/indigo.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added public/images/organization-logos/oxfam.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added public/images/organization-logos/progressio.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added public/images/organization-logos/publish.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added public/images/organization-logos/rem.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added public/images/organization-logos/spark.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added public/images/organization-logos/undp.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added public/images/organization-logos/unops.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
79 changes: 77 additions & 2 deletions public/stylesheets/layout.css
Expand Up @@ -20,7 +20,7 @@
#header .top_nav ul#primary_nav { width:550px;}
#header .top_nav ul#secondary_nav { float:right; width:400px;}
#header .top_nav ul#secondary_nav li{ float:right;}
#header .top_nav ul#secondary_nav li.last_right{background:none; padding:0 0 0 15px;}
#header .top_nav ul#secondary_nav li{background:none; padding:0 0 0 5px;}

#header .top_nav ul li a:hover, #header .top_nav ul li a.active{ color:#ff3300; text-decoration:none;}

Expand Down Expand Up @@ -452,4 +452,79 @@
margin-bottom:5px;
font-size:1.2em;
}
a.hl{ text-decoration: underline;}
a.hl{ text-decoration: underline;}

/* organizations list */
/*--------------------*/

#organizations_list ul li {
float: left;
display: block;
width: 110px;
height: 110px;
padding: 0;
margin: 0px 17px 17px 0;
border: 1px solid #cfcfcf;
}

#organizations_list ul li a {
float: left;
width: 100%;
height: 100%;
padding: 0;
margin: 0;
}

#organizations_list ul li a.adra {
background: url(/images/organization-logos/adrauk.png) no-repeat 0px 0;
}
#organizations_list ul li a.adb {
background: url(/images/organization-logos/adb.png) no-repeat 0px 0;
}
#organizations_list ul li a.alliance {
background: url(/images/organization-logos/alliance.png) no-repeat 0px 0;
}
#organizations_list ul li a.hewlett {
background: url(/images/organization-logos/hewlett.png) no-repeat 0px 0;
}

#organizations_list ul li a.unops {
background: url(/images/organization-logos/unops.png) no-repeat 0px 0;
}

#organizations_list ul li a.undp {
background: url(/images/organization-logos/undp.png) no-repeat 0px 0;
}

#organizations_list ul li a.spark {
background: url(/images/organization-logos/spark.png) no-repeat 0px 0;
}
#organizations_list ul li a.rem {
background: url(/images/organization-logos/rem.png) no-repeat 0px 0;
}
#organizations_list ul li a.progressio {
background: url(/images/organization-logos/progressio.png) no-repeat 0px 0;
}
#organizations_list ul li a.oxfam {
background: url(/images/organization-logos/oxfam.png) no-repeat 0px 0;
}
#organizations_list ul li a.publish {
background: url(/images/organization-logos/publish.png) no-repeat 0px 0;
}
#organizations_list ul li a.indigo {
background: url(/images/organization-logos/indigo.png) no-repeat 0px 0;
}
#organizations_list ul li a.globalfund {
background: url(/images/organization-logos/globalfund.png) no-repeat 0px 0;
}
#organizations_list ul li a.engineerswithoutborders {
background: url(/images/organization-logos/engineerswithoutborders.png) no-repeat 0px 0;
}
#organizations_list ul li a.developmentinitiatives {
background: url(/images/organization-logos/developmentinitiatives.png) no-repeat 0px 0;
}
#organizations_list ul li a.cafod {
background: url(/images/organization-logos/cafod.png) no-repeat 0px 0;
}

#organizations_list ul li a:hover { background-position: 0px -110px; }

0 comments on commit 7e9bc30

Please sign in to comment.