Merge branch 'alertclickable'

lizonze292 · Jul 5, 2015 · 0216bf3 · 0216bf3
2 parents 56daa6b + 227dc24
commit 0216bf3
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 10 deletions.
diff --git a/_layouts/base.html b/_layouts/base.html
@@ -24,7 +24,7 @@
 <div id="detectmobile" class="detectmobile"></div>
 {% if site.ALERT %}
   <div class="banner-message alert">
-    <div><div>{{ site.ALERT }}</div></div>
+    <a href="{{ site.ALERTURL }}"><span>{{ site.ALERT }}</span></a>
   </div>
 {% endif %}
   <div class="head"><div>

diff --git a/_less/screen.less b/_less/screen.less
@@ -142,27 +142,29 @@ table td,table th{
 	font-style:italic;
 }
 
-.banner-message div div{
-	margin:auto;
-	width:850px;
-	padding:10px;
-}
 .banner-message,
 .banner-message a,
 .banner-message a:link,
 .banner-message a:active,
 .banner-message a:visited{
+	display:block;
 	color:#fff;
 }
 .banner-message a:hover{
 	text-decoration:underline;
 }
-.banner-message.alert div{
+.banner-message.alert a{
 	background-color:#c5251f;
 }
-.banner-message.info div{
+.banner-message.info a{
 	background-color:#0d579b;
 }
+.banner-message a span{
+	display:block;
+	margin:auto;
+	width:850px;
+	padding:10px;
+}
 
 .head{
 	margin:30px 0 30px 0;
@@ -2162,7 +2164,7 @@ h2 .rssicon{
 		margin:auto;
 		margin-bottom:5px;
 	}
-	.banner-message div div{
+	.banner-message a span{
 		width:auto;
 	}
 	.head{

diff --git a/_plugins/alerts.rb b/_plugins/alerts.rb
@@ -37,7 +37,8 @@ def initialize(site, base, lang, srcdir, src, dstdir, dst, date)
       else
         self.data['category'] = 'alert'
         if self.data.has_key?('banner') and !self.data['banner'].nil? and self.data['banner'].length>0
-          site.config['ALERT']='<a href="/'+dstdir+'/'+dst.gsub('.html','')+'">'+self.data['banner']+'</a>'
+          site.config['ALERT']=self.data['banner']
+          site.config['ALERTURL']='/'+dstdir+'/'+dst.gsub('.html','')
         end
         if self.data.has_key?('active') and !self.data['active'].nil? and self.data['active'] == true
           site.config['STATUS']=1