From 95da40084392edba647aa20ba21bf8b8a08c2768 Mon Sep 17 00:00:00 2001
From: nccu <nccu@test174.(none)>
Date: Wed, 25 Feb 2015 11:41:53 +0800
Subject: [PATCH] help designer to push code

---
 app/templates/nccu/assets/javascripts/app.js  | 12 ++++++--
 .../nccu/modules/ad_banner/_widget1.html.erb  |  2 +-
 .../nccu/modules/ad_banner/_widget2.html.erb  |  2 +-
 app/views/orbit_bar/index.html.erb            | 29 ++++---------------
 4 files changed, 17 insertions(+), 28 deletions(-)

diff --git a/app/templates/nccu/assets/javascripts/app.js b/app/templates/nccu/assets/javascripts/app.js
index 8a25489..15ff790 100644
--- a/app/templates/nccu/assets/javascripts/app.js
+++ b/app/templates/nccu/assets/javascripts/app.js
@@ -2,7 +2,15 @@
 
     // Init functions
     function init() {
-        
+
+        function checkAdBannerAlt() {
+            $( ".widget-adBanner .slide-img > img" ).each( function(){
+                if( $(this).attr( "alt" ) === "" ) {
+                    $(this).attr( "alt", "AD Banner Image" );                    
+                }
+            });
+        }
+
         // Add link and cursor class name on element that has data-link attribute
         function addLinkOnADBanner( els ) {
             $.each( els, function() {
@@ -164,7 +172,7 @@
         removeSignUpItem();
         addClassOnLastMenuItem();
         addLinkOnADBanner( $(".cycle-slideshow > .slide-img") );
-
+        checkAdBannerAlt();
     }
 
     $(document).ready(function($) {
diff --git a/app/templates/nccu/modules/ad_banner/_widget1.html.erb b/app/templates/nccu/modules/ad_banner/_widget1.html.erb
index fd2ccd6..8a68bac 100644
--- a/app/templates/nccu/modules/ad_banner/_widget1.html.erb
+++ b/app/templates/nccu/modules/ad_banner/_widget1.html.erb
@@ -15,7 +15,7 @@
         data-overlay-template="<h2>{{title}}</h2>{{desc}}"
         data-target="{{target}}"
       >
-        <img src="{{image_link}}">
+        <img src="{{image_link}}" alt="{{title}}">
     </div>
   </div>
   <div class="widget-adBanner-overlay">
diff --git a/app/templates/nccu/modules/ad_banner/_widget2.html.erb b/app/templates/nccu/modules/ad_banner/_widget2.html.erb
index f40e01e..17e8225 100644
--- a/app/templates/nccu/modules/ad_banner/_widget2.html.erb
+++ b/app/templates/nccu/modules/ad_banner/_widget2.html.erb
@@ -15,7 +15,7 @@
         data-overlay-template="<h2>{{title}}</h2>{{desc}}"
         data-target="{{target}}"
       >
-        <img src="{{image_link}}">
+        <img src="{{image_link}}" alt="{{title}}">
     </div>
   </div>
   <div class="widget-adBanner-overlay2">
diff --git a/app/views/orbit_bar/index.html.erb b/app/views/orbit_bar/index.html.erb
index bae43d5..3d2ad5a 100644
--- a/app/views/orbit_bar/index.html.erb
+++ b/app/views/orbit_bar/index.html.erb
@@ -37,7 +37,7 @@
         <i class="icons-list-2"></i>
       </label>
       <h2 class="orbit-bar-title">
-        <a href="/">Orbit</a>
+        <a href="/">NCCU</a>
       </h2>
       <ul class="orbit-bar-menu">
         <li>
@@ -112,11 +112,11 @@
           <ul>
             <% @site_in_use_locales.each do |l| %>
               <li class="<%= (l == I18n.locale and !session['zh_cn']) ? "active" : "" %>">
-                <a href="<%= switch_language(l) %>" data-toggle="modal" ><%= t((l==:zh_tw ? :zh_tw_ : :_locale ), :locale => l) %></a>
+                <a href="<%= switch_language(l) %>"><%= t((l==:zh_tw ? :zh_tw_ : :_locale ), :locale => l) %></a>
               </li>
               <% if current_site.enable_zh_cn and l == :zh_tw and !request.path.include?("/admin/") %>
                 <li class="<%= locale==:zh_cn ? "active" : "" %>">
-                  <a href="<%= switch_language(:zh_cn) %>" data-toggle="modal" ><%= t(:zh_cn, :locale => :zh_tw) %></a>
+                  <a href="<%= switch_language(:zh_cn) %>"><%= t(:zh_cn, :locale => :zh_tw) %></a>
                 </li>
               <% end %>
             <% end %>
@@ -127,7 +127,6 @@
           <li>
             <span id="user"><%= current_user.member_profile.name.nil? ? current_user.user_name : current_user.member_profile.name %></span>
             <ul>
-              <li><%= link_to content_tag(:i, nil, class: 'icons-tools') + ' ' +  t("users.change_passwd"),admin_member_edit_passwd_path(current_user.member_profile.to_param), tabindex: '-1' %></li>
               <li><%= link_to content_tag(:i, nil, class: 'icons-vcard') + ' ' +  t("users.user_basic_data"),admin_member_path(current_user.member_profile.to_param), tabindex: '-1' %></li>
               <li>
                 <a href="/logout"><i class="icons-logout"></i><%= t(:logout) %></a>
@@ -144,28 +143,10 @@
       </ul>
     </div>
   </div>
-  <% if params[:controller] == "pages" %>
-    <div class="modal fade" id="language_alert">
-    <div class="modal-dialog">
-      <div class="modal-content">
-        <div class="modal-header">
-          <button type="button" class="close" data-dismiss="modal"><span aria-hidden="true">&times;</span><span class="sr-only">Close</span></button>
-          <h4 class="modal-title">We are sorry.</h4>
-        </div>
-        <div class="modal-body">
-          <p>This page is not available in this language.</p>
-        </div>
-        <div class="modal-footer">
-          <button type="button" class="btn btn-primary" data-dismiss="modal">Close</button>
-        </div>
-      </div>
-    </div>
-  </div>
-  <% end %>
-<script type="text/javascript">
+  <script type="text/javascript">
   $("#open-orbit-login").on("change",function(){
     if($(this).is(":checked")){
       $("#user_user_id").focus();
     }
   })
-</script>
+  </script>
\ No newline at end of file