diff --git a/application/admin/controllers/DataController.php b/application/admin/controllers/DataController.php
index 7f6ac475..d4e7d038 100755
--- a/application/admin/controllers/DataController.php
+++ b/application/admin/controllers/DataController.php
@@ -2568,9 +2568,9 @@ class Admin_DataController extends Zend_Controller_Action
if(!empty($keywords))
{
- $search=new Search($keywords);
+ $search=new SimpleSearch($keywords);
$where=$search->sql_expr(array("md.title"));
- $sql.=' and '.$where;
+ $sql.=' and ('.$where.")";
}
$sql .= "GROUP by md.id,md.title,md.uuid,md.ts_created
@@ -2816,7 +2816,7 @@ class Admin_DataController extends Zend_Controller_Action
if(!empty($keywords))
{
- $search=new Search($keywords);
+ $search=new SimpleSearch($keywords);
$where=$search->sql_expr(array("md.title"));
$sql.=' WHERE '.$where;
}
@@ -3579,13 +3579,13 @@ class Admin_DataController extends Zend_Controller_Action
return true;
}//index
- if($ac == "add")
+ else if($ac == "add")
{
$this->_helper->viewRenderer('doi-add');
}//add
- if($ac == "edit")
+ else if($ac == "edit")
{
$this->_helper->viewRenderer('doi-add');
$id = $this->_getParam('id');
@@ -3644,7 +3644,7 @@ class Admin_DataController extends Zend_Controller_Action
}
}//edit
- if($ac == "del")
+ else if($ac == "del")
{
$this->_helper->layout->disableLayout();
$this->_helper->viewRenderer->setNoRender();
@@ -3667,7 +3667,62 @@ class Admin_DataController extends Zend_Controller_Action
}
}//del
-
+ else if ($ac=="convert") //转换为chinadoi所需元数据格式
+ {
+ $this->_helper->layout->disableLayout();
+ $this->_helper->viewRenderer->setNoRender();
+ $sql="select d.*,m.description from datadoi d left join metadata m on d.uuid=m.uuid where d.uuid='$uuid'";
+ $row=$this->db->fetchRow($sql);
+ $timestamp=date('YmdHis');
+ $authors=explode(',',substr($row['authors'],1,-1));
+ $orgs=explode(',',substr($row['organization'],1,-1));
+ $doi='
+
+ '.$timestamp.'
+ '.$timestamp.'
+
+ ISTIC
+ tuy@istic.ac.cn
+
+ ISTIC
+
+
+
+
+ ';
+ foreach($authors as $k=>$v)
+ {
+ $doi.=''.$v.' ';
+ $doi.=''.$orgs[$k].' ';
+ }
+ $doi.='
+
+ '.$row['title'].'
+
+ ';
+ $doi.=''.$row['description'].' ';
+ $doi.=''.$row['publisher'].' ';
+ $doi.='
+ '.$row['doi'].'
+ '.$timestamp.'
+
+ ';
+ $doi.='
+
+
+ ';
+ $this->getResponse()->setHeader('Content-Type', 'text/xml')->setHeader('Content-Disposition','attachment; filename="'.$row['uuid'].'.xml"')
+ ->setHeader('Content-Type','application/force-download')->setBody($doi);
+ $this->db->query('update datadoi set ts_submitted=now() where uuid=?',array($uuid));
+ }
+ else if ($ac=="verified") //成功申请
+ {
+ $sql="update datadoi set ts_published=now() where uuid=? and ts_published is null";
+ $this->db->query($sql,array($uuid));
+ $this->_helper->layout->disableLayout();
+ $this->_helper->viewRenderer->setNoRender();
+ $this->jsonexit(array('success'=>'成功申请'));
+ }
}//doi
//发送邀请专家的邮件
diff --git a/application/admin/controllers/ReviewController.php b/application/admin/controllers/ReviewController.php
index c79e2953..d672d753 100644
--- a/application/admin/controllers/ReviewController.php
+++ b/application/admin/controllers/ReviewController.php
@@ -5,13 +5,9 @@ class Admin_ReviewController extends Zend_Controller_Action
{
$this->db=Zend_Registry::get('db');
$this->view->config = Zend_Registry::get('config');
- $this->messenger=$this->_helper->getHelper('FlashMessenger');
- $this->view->messages = $this->messenger->getMessages();
- }
-
- function postDispatch()
- {
- //$this->view->messages = $this->messenger->getMessages();
+ $this->view->theme = new Theme();
+ $this->_helper->layout->setLayout('administry');
+ $this->view->pageID = "review-".$this->_request->getActionName();
}
/*
@@ -145,10 +141,12 @@ class Admin_ReviewController extends Zend_Controller_Action
$update = $this->_request->getParam('update');
$invite = $this->_request->getParam('invite');
+ include_once("helper/view.php");
+
if($cancel>0)
{
if($this->changestatus($cancel,-1))
- {
+ {
//update search document
$search=new Search();
//create search view in xunsearch
@@ -157,16 +155,17 @@ class Admin_ReviewController extends Zend_Controller_Action
$sth->execute(array($cancel));
$data = $sth->fetch();
$search->del($data['uuid'],'uuid');
- $this->messenger->addMessage('操作成功:已取消该数据的评审');
- $this->_redirect("/admin/review/accept");
+ view::Post($this,array("content"=>'操作成功:已取消该数据的评审','url'=>'/admin/review/accept'));
+ return true;
}
else{
- $this->messenger->addMessage('操作失败');
- $this->_redirect("/admin/review/accept");
+ view::Post($this,array("content"=>'操作失败','url'=>'/admin/review/accept'));
+ return true;
}
}//取消元数据评审
if($search)
{
+
$keyword = $this->_request->getParam('keyword');
if(!empty($keyword))
{
@@ -283,7 +282,7 @@ class Admin_ReviewController extends Zend_Controller_Action
}
$sql = "select m.id,md.title,m.status,m.uuid,u.username,u.realname from mdstatus m
- right join metadata md on md.uuid=m.uuid
+ right join metadata md on md.uuid=m.uuid
left join users u on u.id=m.userid
where m.status in (2,3,4) $searchjoin order by m.ts_accepted desc";
$rs = $this->db->query($sql);
@@ -339,6 +338,8 @@ class Admin_ReviewController extends Zend_Controller_Action
$this->view->id = $id;
+ include_once("helper/view.php");
+
if(!empty($submit))
{
if(is_array($exps))
@@ -361,7 +362,8 @@ class Admin_ReviewController extends Zend_Controller_Action
$rows = $rs->fetch();
if($rows['id']!='')
{
- $this->messenger->addMessage('已经邀请过专家:'.$rows['realname']);
+ view::Post($this,array("content"=>'已经邀请过专家:'.$rows['realname'],'url'=>-1));
+ return true;
}//已经有评审记录
else
{
@@ -392,14 +394,17 @@ class Admin_ReviewController extends Zend_Controller_Action
$mail->createAttachment($filecontent,'application/octet-stream',Zend_Mime::DISPOSITION_ATTACHMENT, Zend_Mime::ENCODING_BASE64, $md['title'].'.pdf');
if($mail->send())
{
- $this->messenger->addMessage('成功邀请专家:'.$expinfo['realname']);
+ view::Post($this,array("content"=>'成功邀请专家:'.$expinfo['realname'],'url'=>-1));
+ return true;
}else
{
- $this->messenger->addMessage('邀请专家'.$expinfo['realname'].'的邮件发送失败,请尝试手动发送邀请邮件');
+ view::Post($this,array("content"=>'邀请专家'.$expinfo['realname'].'的邮件发送失败,请尝试手动发送邀请邮件','url'=>-1));
+ return true;
}
}
}catch(Exception $e){
- $this->messenger->addMessage('邀请失败:'.$e->getMessage());
+ view::Post($this,array("content"=>'邀请失败:'.$e->getMessage(),'url'=>-1));
+ return true;
}
}//不存在原来的记录
}//循环结束
@@ -407,8 +412,8 @@ class Admin_ReviewController extends Zend_Controller_Action
}
else
{
- $this->messenger->addMessage('请选择要邀请的专家');
- $this->_redirect("/admin/review/invite/?id=$id");
+ view::Post($this,array("content"=>'请选择要邀请的专家','url'=>"/admin/review/invite/?id=$id"));
+ return true;
}
} elseif ($user>0) {
$uuid=$this->_request->getParam('uuid');
@@ -429,12 +434,12 @@ class Admin_ReviewController extends Zend_Controller_Action
$mail->createAttachment($filecontent,'application/octet-stream',Zend_Mime::DISPOSITION_ATTACHMENT, Zend_Mime::ENCODING_BASE64, $row['title'].'.pdf');
if($mail->send())
{
- $this->messenger->addMessage('成功再次邀请专家:'.$row['realname']);
- $this->_redirect("/admin/review/inreview/show/$id");
+ view::Post($this,array("content"=>'成功再次邀请专家:'.$row['realname'],'url'=>"/admin/review/inreview/show/$id"));
+ return true;
}else
{
- $this->messenger->addMessage('邀请专家'.$row['realname'].'的邮件发送失败,请尝试手动发送邀请邮件');
- $this->_redirect("/admin/review/inreview/show/$id");
+ view::Post($this,array("content"=>'邀请专家'.$row['realname'].'的邮件发送失败,请尝试手动发送邀请邮件','url'=>"/admin/review/inreview/show/$id"));
+ return true;
}
}
$searchjoin = "";
@@ -497,12 +502,12 @@ class Admin_ReviewController extends Zend_Controller_Action
$sql = "update mdstatus set userid='$uid' where id='$id'";
if($this->db->exec($sql)>0)
{
- $this->messenger->addMessage('更改管理员成功');
- $this->_redirect("/admin/review/changeadmin/?id=$id");
+ include_once('helper/view.php');
+ view::Post($this,array("content"=>'修改成功','url'=>-1));
+ return true;
}
}
-
-
+
$sql = "select u.* from users u
where usertype='administrator'";
$re = $this->db->query($sql);
@@ -534,27 +539,29 @@ class Admin_ReviewController extends Zend_Controller_Action
$re = $this->db->query($sql);
$row = $re->fetch();
+ include_once('helper/view.php');
+
if(empty($row['id']))
{
$sql = "insert into mdstatus (uuid,userid,status) values ('$uuid','$userid','0')";
try{
if($this->db->exec($sql)>0)
{
- $this->messenger->addMessage('操作成功!该数据已放入评审');
- $this->_redirect("/admin/review/draft");
+ view::Post($this,array("content"=>'操作成功!该数据已放入评审','url'=>'/admin/review/draft'));
+ return true;
}
}catch( Exception $e){
- $this->messenger->addMessage('操作失败:'.$e->getMessage());
- $this->_redirect("/admin/review/draft");
+ view::Post($this,array("content"=>'操作失败:'.$e->getMessage(),'url'=>'/admin/review/draft'));
+ return true;
}
} else if ($row['status']==5){
$sql="update mdstatus set status=1,ts_accepted=now() where status=5 and id=".$row['id'];
$this->db->query($sql);
- $this->messenger->addMessage('操作成功!该数据已重新放入评审');
- $this->_redirect("/admin/review/accept");
+ view::Post($this,array("content"=>'操作成功!该数据已重新放入评审','url'=>'/admin/review/accept'));
+ return true;
} else {
- $this->messenger->addMessage('该数据已放入评审');
- $this->_redirect("/admin/data/md");
+ view::Post($this,array("content"=>'该数据已放入评审','url'=>'/admin/data/md'));
+ return true;
}
}//将数据放入评审
@@ -589,10 +596,10 @@ class Admin_ReviewController extends Zend_Controller_Action
$this->view->keyword = $keyword;
}
- $sql = "select m.id,md.uuid,md.title,u.username,u.realname,m.status from mdstatus m
+ $sql = "select m.id,md.uuid,md.title,u.username,u.realname,m.status,md.id as mdid from mdstatus m
right join metadata md on md.uuid=m.uuid
left join users u on u.id=m.userid
- where m.status in (0,1,2,3,4) and u.id='$userid' $searchjoin order by m.status desc,m.ts_accepted desc";
+ where m.status in (0,1,2,3,4) and u.id='$userid' $searchjoin order by m.status desc,m.ts_accepted desc";
$re = $this->db->query($sql);
$rows = $re->fetchAll();
@@ -648,6 +655,7 @@ class Admin_ReviewController extends Zend_Controller_Action
$id = $this->_request->getParam('id');
$emails = $this->_request->getParam('emails');
+ include_once('helper/view.php');
$auth = Zend_Auth::getInstance();
if($auth->hasIdentity())
{
@@ -663,7 +671,6 @@ class Admin_ReviewController extends Zend_Controller_Action
if($this->changestatus($id,5))
{
- $this->messenger->addMessage('操作成功:该元数据成功发布');
//发布正式版本
$sql = "UPDATE mdversion SET changelog=?,userid=? WHERE id in (select id from mdversion where uuid in (select uuid from mdstatus where id=?) order by ts_created desc limit 1)";
$this->db->query($sql,array('发布第一个正式版本 version 1.0',$userid,$id));
@@ -681,26 +688,25 @@ class Admin_ReviewController extends Zend_Controller_Action
$mail->addTo($emails);
$mail->setSubject($mailtp->getSubject());
$mail->send();
- $this->_redirect("/admin/review/myreview");
+
+ view::Post($this,array("content"=>'操作成功:该元数据成功发布','url'=>"/admin/review/myreview"));
+ return true;
}else{
- $this->messenger->addMessage('操作失败');
- $this->_redirect("/admin/review/myreview");
+ view::Post($this,array("content"=>'操作失败','url'=>"/admin/review/myreview"));
+ return true;
}
}else{
-
- $this->messenger->addMessage('您没有权限操作其他管理员管理的元数据评审');
- $this->_redirect("/admin/review/myreview");
-
+ view::Post($this,array("content"=>'您没有权限操作其他管理员管理的元数据评审','url'=>"/admin/review/myreview"));
+ return true;
}
}else
{
- $this->messenger->addMessage('权限读取失败');
- $this->_redirect("/admin/review/myreview");
+ view::Post($this,array("content"=>'权限读取失败','url'=>"/admin/review/myreview"));
+ return true;
}
-
}//发布元数据
/*
@@ -713,19 +719,17 @@ class Admin_ReviewController extends Zend_Controller_Action
* 对需要重新评审的元数据进行回滚,即状态为3
*/
function rollbackAction(){
-
$id=$this->_request->getParam('id');
-
+ include_once("helper/view.php");
if($this->changestatus($id,3))
{
- $this->messenger->addMessage('操作成功!');
- $this->_redirect("/admin/review/reviewed");
+ view::Post($this,array("content"=>'操作成功!','url'=>"/admin/review/reviewed"));
+ return true;
}
else{
- $this->messenger->addMessage('操作失败'.$id);
- $this->_redirect("/admin/review/reviewed");
+ view::Post($this,array("content"=>'操作失败'.$id,'url'=>"/admin/review/reviewed"));
+ return true;
}
-
}//重新评审
@@ -745,6 +749,8 @@ class Admin_ReviewController extends Zend_Controller_Action
$keyword = $this->_request->getParam('keyword');
$update = $this->_request->getParam('update');
+ include_once("helper/view.php");
+
if($update>0 || is_array($update))
{
$ids = '';
@@ -752,17 +758,17 @@ class Admin_ReviewController extends Zend_Controller_Action
else $ids=$update;
if($this->changestatus($ids,1))
- {
+ {
//update search document
$search=new Search();
//create search view in xunsearch
$sql="select * from xunsearch where uuid in (select uuid from mdstatus where id in (".$ids."))";
$sth = $this->db->prepare($sql);
- $sth->execute();
- while ($data = $sth->fetch())
+ $sth->execute();
+ while ($data = $sth->fetch())
{
- $search->update($data);
- }
+ $search->update($data);
+ }
//仅对单条数据发送email信息,并且注册为数据作者
if (is_numeric($ids))
@@ -795,12 +801,12 @@ class Admin_ReviewController extends Zend_Controller_Action
$mail->send();
}
}
- $this->messenger->addMessage('操作成功!');
- $this->_redirect("/admin/review/draft");
+ view::Post($this,array("content"=>'操作成功!'.$id,'url'=>"/admin/review/draft"));
+ return true;
}
else{
- $this->messenger->addMessage('操作失败');
- $this->_redirect("/admin/review/accept");
+ view::Post($this,array("content"=>'操作失败'.$id,'url'=>"/admin/review/accept"));
+ return true;
}
}//开始评审
@@ -847,7 +853,7 @@ class Admin_ReviewController extends Zend_Controller_Action
$search=$this->_request->getParam('search');
$keyword = $this->_request->getParam('keyword');
$update = $this->_request->getParam('update');
-
+ include_once('helper/view.php');
if($update>0 || is_array($update))
{
$ids = '';
@@ -856,12 +862,12 @@ class Admin_ReviewController extends Zend_Controller_Action
if($this->changestatus($ids,0))
{
- $this->messenger->addMessage('操作成功!');
- $this->_redirect("/admin/review/canceled");
+ view::Post($this,array("content"=>'操作成功!','url'=>"/admin/review/canceled"));
+ return true;
}
else{
- $this->messenger->addMessage('操作失败'.$ids);
- $this->_redirect("/admin/review/canceled");
+ view::Post($this,array("content"=>'操作失败'.$ids,'url'=>"/admin/review/canceled"));
+ return true;
}
}//取消评审
@@ -943,6 +949,7 @@ class Admin_ReviewController extends Zend_Controller_Action
function deleteAction(){
$id=$this->_request->getParam('id');
+ include_once("helper/view.php");
try{
$auth = Zend_Auth::getInstance();
if($auth->hasIdentity())
@@ -959,30 +966,26 @@ class Admin_ReviewController extends Zend_Controller_Action
$sql = "delete from mdstatus where id='$id'";
if($this->db->exec($sql))
{
- $this->messenger->addMessage('删除成功');
- $this->_redirect("/admin/review/myreview");
+ view::Post($this,array("content"=>'删除成功','url'=>"/admin/review/myreview"));
+ return true;
}else{
- $this->messenger->addMessage('删除失败');
- $this->_redirect("/admin/review/myreview");
+ view::Post($this,array("content"=>'删除失败','url'=>"/admin/review/myreview"));
+ return true;
}
}else{
-
- $this->messenger->addMessage('您没有权限操作其他管理员管理的元数据评审');
- $this->_redirect("/admin/review/myreview");
-
+ view::Post($this,array("content"=>'您没有权限操作其他管理员管理的元数据评审','url'=>"/admin/review/myreview"));
+ return true;
}
-
}else
{
- $this->messenger->addMessage('权限读取失败');
- $this->_redirect("/admin/review/myreview");
+ view::Post($this,array("content"=>'权限读取失败','url'=>"/admin/review/myreview"));
+ return true;
}
}catch(Exception $e){
- $this->messenger->addMessage('删除失败:'.$e->getMessage());
- $this->_redirect("/admin/review/myreview");
+ view::Post($this,array("content"=>'删除失败:'.$e->getMessage(),'url'=>"/admin/review/myreview"));
+ return true;
}
-
}
@@ -1008,6 +1011,8 @@ class Admin_ReviewController extends Zend_Controller_Action
$del = $this->_request->getParam('del');
$add = $this->_request->getParam('add');
+ include_once("helper/view.php");
+
if($add)
{
if(!empty($submit))
@@ -1047,9 +1052,8 @@ class Admin_ReviewController extends Zend_Controller_Action
if(!empty($test['id']))
{
- $this->messenger->addMessage('用户名或邮箱重复');
- $this->_redirect("/admin/review/experts");
-
+ view::Post($this,array("content"=>'用户名或邮箱重复','url'=>"/admin/review/experts"));
+ return true;
}
else
@@ -1083,8 +1087,8 @@ class Admin_ReviewController extends Zend_Controller_Action
$sql="insert into mdexperts (id,speciality) values ('{$row['id']}','$speciality')";
if($this->db->exec($sql)>0)
{
- $this->messenger->addMessage('成功添加评审专家');
- $this->_redirect("/admin/review/experts");
+ view::Post($this,array("content"=>'成功添加评审专家','url'=>"/admin/review/experts"));
+ return true;
}
}
@@ -1102,8 +1106,8 @@ class Admin_ReviewController extends Zend_Controller_Action
$sql="delete from mdexperts where id='$del'";
if($this->db->exec($sql)>0)
{
- $this->messenger->addMessage('删除成功!');
- $this->_redirect('/admin/review/experts');
+ view::Post($this,array("content"=>'删除成功!','url'=>'/admin/review/experts'));
+ return true;
}
}
@@ -1115,8 +1119,8 @@ class Admin_ReviewController extends Zend_Controller_Action
$sql = "update mdexperts set speciality='$speciality',ts_modified='".date("Y-m-d H:i:s",time())."' where id='$edit'";
if($this->db->exec($sql)>0)
{
- $this->messenger->addMessage('编辑成功!');
- $this->_redirect('/admin/review/experts');
+ view::Post($this,array("content"=>'编辑成功!','url'=>'/admin/review/experts'));
+ return true;
}
}
else
@@ -1193,15 +1197,15 @@ class Admin_ReviewController extends Zend_Controller_Action
$id = $this->_request->getParam('id');
$q = $this->_request->getParam('q');
$search = $this->_request->getParam('search');
-
+ include_once('helper/view.php');
if($ac=='view' && !empty($id))
{
$redirect = "/admin/review/comments/ac/view/id/$id";
if(!is_numeric($id))
{
- $this->messenger->addMessage('参数不正确,请按正确的步骤进行访问');
- $this->_redirect($redirect);
+ view::Post($this,array("content"=>'参数不正确,请按正确的步骤进行访问','url'=>$redirect));
+ return true;
}
$sql = "select r.*,md.title,u.realname,u.id as uid from mdreview r
@@ -1216,8 +1220,8 @@ class Admin_ReviewController extends Zend_Controller_Action
if(empty($row['id']))
{
- $this->messenger->addMessage('该评审不存在或者已删除');
- $this->_redirect($redirect);
+ view::Post($this,array("content"=>'该评审不存在或者已删除','url'=>$redirect));
+ return true;
}
$sql = "select att.realname,att.id from attachments att
@@ -1274,8 +1278,8 @@ class Admin_ReviewController extends Zend_Controller_Action
{
if (preg_match("/[<|>|#|$|%|^|*|(|)|{|}|'|\"|;|:]/i",$q) || !is_numeric($search))
{
- $this->messenger->addMessage('您的输入的搜索条件包含非法请求,请不要输入特殊符号');
- $this->_redirect($redirect);
+ view::Post($this,array("content"=>'您的输入的搜索条件包含非法请求,请不要输入特殊符号','url'=>$redirect));
+ return true;
}
$this->view->q = $q;
$wheresql[] = " (md.title like '%$q%' or u.realname like '%$q%') ";
@@ -1325,8 +1329,8 @@ class Admin_ReviewController extends Zend_Controller_Action
{
if (preg_match("/[<|>|#|$|%|^|*|(|)|{|}|'|\"|;|:]/i",$q) || !is_numeric($search))
{
- $this->messenger->addMessage('您的输入的搜索条件包含非法请求,请不要输入特殊符号');
- $this->_redirect($redirect);
+ view::Post($this,array("content"=>'您的输入的搜索条件包含非法请求,请不要输入特殊符号','url'=>$redirect));
+ return true;
}
$this->view->q = $q;
$wheresql[] = " u.realname like '%$q%' ";
@@ -1370,8 +1374,8 @@ class Admin_ReviewController extends Zend_Controller_Action
if(!is_numeric($id))
{
- $this->messenger->addMessage('参数不正确,请按正确的步骤进行访问');
- $this->_redirect($redirect);
+ view::Post($this,array("content"=>'参数不正确,请按正确的步骤进行访问','url'=>$redirect));
+ return true;
}
$sql = "select r.id,att.filename,ratt.attachid as attid from mdreview r
@@ -1394,8 +1398,8 @@ class Admin_ReviewController extends Zend_Controller_Action
$sql = "delete from mdreview where id='$id'";
if($this->db->exec($sql)>0)
{
- $this->messenger->addMessage('评审意见删除成功!');
- $this->_redirect($redirect);
+ view::Post($this,array("content"=>'评审意见删除成功!','url'=>$redirect));
+ return true;
}
}
else
@@ -1403,16 +1407,16 @@ class Admin_ReviewController extends Zend_Controller_Action
$sql = "delete from mdreview where id='$id'";
if($this->db->exec($sql)>0)
{
- $this->messenger->addMessage('评审意见删除成功!但附件删除失败,请手动删除文件:'.$row['filename']);
- $this->_redirect($redirect);
+ view::Post($this,array("content"=>'评审意见删除成功!但附件删除失败,请手动删除文件:'.$row['filename'],'url'=>$redirect));
+ return true;
}
}
}else{
$sql = "delete from mdreview where id='$id'";
if($this->db->exec($sql)>0)
{
- $this->messenger->addMessage('评审意见删除成功!');
- $this->_redirect($redirect);
+ view::Post($this,array("content"=>'评审意见删除成功!','url'=>$redirect));
+ return true;
}
}
}//删除评审意见 同时删除附件
@@ -1428,16 +1432,16 @@ class Admin_ReviewController extends Zend_Controller_Action
if($this->db->exec($sql))
{
- $this->messenger->addMessage('更改成功');
- $this->_redirect($redirect);
+ view::Post($this,array("content"=>'更改成功','url'=>$redirect));
+ return true;
}else{
- $this->messenger->addMessage('更新失败');
- $this->_redirect($redirect);
+ view::Post($this,array("content"=>'更改失败','url'=>$redirect));
+ return true;
}
}catch(Exception $e){
- $this->messenger->addMessage('更新失败:'.$e->getMessage());
- $this->_redirect($redirect);
+ view::Post($this,array("content"=>'更新失败:'.$e->getMessage(),'url'=>$redirect));
+ return true;
}
}//为用户重置为草稿状态
@@ -1455,8 +1459,8 @@ class Admin_ReviewController extends Zend_Controller_Action
{
if (preg_match("/[<|>|#|$|%|^|*|(|)|{|}|'|\"|;|:]/i",$q) || !is_numeric($search))
{
- $this->messenger->addMessage('您的输入的搜索条件包含非法请求,请不要输入特殊符号');
- $this->_redirect($redirect);
+ view::Post($this,array("content"=>'您的输入的搜索条件包含非法请求,请不要输入特殊符号','url'=>$redirect));
+ return true;
}//非法请求过滤
$this->view->q = $q;
$wheresql[] = " md.title like '%$q%' ";
@@ -1497,74 +1501,86 @@ class Admin_ReviewController extends Zend_Controller_Action
function replyAction(){
$uuid = $this->_getParam('uuid');
- $send = $this->_getParam('send');
+ $submit = $this->_getParam('submit');
+
+ include_once("helper/view.php");
+ include_once("data/Review.php");
+ include_once("data/Metadata.php");
+ include_once("data/Author.php");
if(empty($uuid))
{
- $jump_url = $this->view->jump_url = 'javascript:history.go(-1);';
- $this->view->msg = "参数错误,如果页面没有跳转请点击这里 ";
+ view::Post($this,array('content'=>'参数错误','url' => -1));
return true;
}
+ $review = new Review($this->db);
+
$this->view->uuid = $uuid;
- $sql = "SELECT mr.*,u.username,u.realname FROM mdreview mr
- LEFT JOIN users u ON mr.userid = u.id
- WHERE mr.uuid = '$uuid'";
-
- $sth = $this->db->query($sql);
- $reviews = $sth->fetchAll();
-
+ $reviews = $review->getReviews($uuid);
$this->view->review = $reviews;
- if(!empty($send))
+ $metadata = new Metadata($this->db);
+ $this->view->md = $metadata->View($uuid);
+
+ $body = "元数据《".$this->view->md['title']."》的作者,您好:\r\n
+ 以下是您的元数据《".$this->view->md['title']."》的反馈信息。\r\n";
+
+ $body .= "--------------------------------------\r\n";
+ if(!empty($reviews))
+ foreach($reviews as $k=>$v)
{
- $sql = "SELECT md.title,u.email FROM metadata md
- LEFT JOIN mdauthor a ON md.uuid=a.uuid
- WHERE md.uuid='$uuid'";
- $sth = $this->db->query($sql);
- $rows = $sth->fetchAll();
+ $body .= $v['username'].":".$v['mdcomment']."\r\n";
+ }
+ else
+ $body .= "\r\n\r\n\r\n";
+ $body .= "--------------------------------------";
+ $body .= "\r\n 西部数据中心服务组";
- $emails = array();
- foreach($rows as $v);
- {
- if(!empty($v['email']))
- {
- $emails[] = $v['email'];
- }
- }
+ $author = new Author($this->db);
+ $emails = $author->getAuthor($uuid,'email');
+
+ if(count($emails)<1)
+ {
+ $email = "";
+ }else{
+ $email = join(";",$emails);
+ }
- if(count($emails)<1)
- {
- $jump_url = $this->view->jump_url = 'javascript:history.go(-1);';
- $this->view->msg = "该元数据未指派作者,如果页面没有跳转请点击这里 ";
- return true;
- }
+ $data = array(
+ 'title'=>"您的元数据《".$this->view->md['title']."》有新的反馈",
+ 'content'=>$body,
+ 'email'=>$email
- $title = $rows[0]['title'];
-
- $this->_helper->layout->disableLayout();
- $this->_helper->viewRenderer->setNoRender();
-
- $body = "元数据《$title》的作者,您好:\r\n
-您的元数据《$title》有反馈信息。\r\n";
-
- foreach($reviews as $k=>$v)
- {
- $body .= $v['username'].":".$v['mdcomment']."\r\n";
- }
-
- $body .= "\r\n 西部数据中心服务组";
+ );
+ $this->view->data = $data;
+
+ if(!empty($submit))
+ {
+ $this->view->data['title'] = $title = $this->_getParam('title');
+ $this->view->data['email'] = $email = $this->_getParam('email');
+ $this->view->data['content'] = $cotent = $this->_getParam('content');
+ $emails = explode(";",$email);
+
$mail=new WestdcMailer($this->view->config->smtp);
- $mail->setBodyText($body);
+ $mail->setBodyText($cotent);
$mail->setFrom($this->view->config->service->email,'西部数据中心服务组');
foreach($emails as $v)
{
$mail->addTo($v);
}
- $mail->setSubject("您的元数据《$title》有新的反馈");
- $mail->send();
+ $mail->setSubject($title);
+
+ if($mail->send())
+ {
+ view::Post($this,array('content'=>'发送成功!','url'=>'/admin/review/reply/uuid/'.$uuid));
+ return true;
+ }else{
+ $this->view->error = view::Error('邮件发送失败');
+ return true;
+ }
}
}//replyAction()
diff --git a/application/admin/views/scripts/data/author-edit.phtml b/application/admin/views/scripts/data/author-edit.phtml
index 2ec8eb93..ac0fd819 100644
--- a/application/admin/views/scripts/data/author-edit.phtml
+++ b/application/admin/views/scripts/data/author-edit.phtml
@@ -2,46 +2,44 @@
$this->headTitle($this->config->title->site);
$this->headTitle($this->config->title->author);
$this->headTitle()->setSeparator(' - ');
-$this->headScript()->appendFile('/js/jquery-1.7.min.js');
-$this->headLink()->appendStylesheet('/css/admin.css');
-$this->headScript()->appendFile('/js/jquery.colorbox-min.js');
-$this->headLink()->appendStylesheet('/css/author.css');
-$this->headLink()->appendStylesheet('/css/colorbox.css');
$this->breadcrumb('首页 ');
$this->breadcrumb('数据管理 ');
$this->breadcrumb('数据作者管理');
$this->breadcrumb()->setSeparator(' > ');
+$this->theme->AppendPlus($this,"colorbox");
?>
-
-
- = $this->partial('data/left.phtml'); ?>
+
+
+ = $this->partial('data/left.phtml'); ?>
+
+
+
+
+ authors)) { ?>
+
authors[0]['title']; ?>
+
添加作者
+
+
添加作者
+
+
+ authors))
+ {
+ foreach($this->authors as $v)
+ {
+ ?>
+
+ [ ]
+ |
+ 移除该作者
+ 认证该用户
+
+
+
+
+
+
-
-
-
-
-
-
-
authors[0]['title']; ?>
-
添加作者
-
- authors))
- {
- foreach($this->authors as $v)
- {
- ?>
-
- [ ]
- |
- 移除该作者
- 认证该用户
-
-
-
-
-
-
+
\ No newline at end of file
diff --git a/application/admin/views/scripts/post-message.phtml b/application/admin/views/scripts/post-message.phtml
new file mode 100644
index 00000000..89d2f043
--- /dev/null
+++ b/application/admin/views/scripts/post-message.phtml
@@ -0,0 +1,21 @@
+headTitle('寒区旱区科学数据中心');
+if(!empty($this->pageTitle))
+{
+ $this->headTitle()->setSeparator(' - ');
+ $this->headTitle($this->pageTitle);
+}
+?>
+
+
+
= $this->content ?>url)) echo ",系统正在为您跳转..."?>
+ url)) {?>
+ url == -1) { ?>
+
如果没有跳转请点击这样
+
+
+
如果没有跳转请点击这样
+
+
+
+
\ No newline at end of file
diff --git a/application/admin/views/scripts/review/accept.phtml b/application/admin/views/scripts/review/accept.phtml
index 5f73468c..9308cd20 100644
--- a/application/admin/views/scripts/review/accept.phtml
+++ b/application/admin/views/scripts/review/accept.phtml
@@ -2,59 +2,61 @@
$this->headTitle($this->config->title->site);
$this->headTitle('后台管理');
$this->headTitle()->setSeparator(' - ');
- $this->headLink()->appendStylesheet('/css/admin.css');
- $this->headScript()->appendFile('/js/jquery-1.6.4.min.js');
$this->breadcrumb('
首页 ');
$this->breadcrumb('
后台首页 ');
$this->breadcrumb('元数据评审');
$this->breadcrumb()->setSeparator(' > ');
?>
-
-= $this->partial('review/left.phtml'); ?>
-
-
-msg or $this->messages) :?>
-
-msg) : ?>
-
msg; ?>
-messages): foreach($this->messages as $msg): ?>
-
-
-
-
-
-
-
-
+
+
+
+ = $this->partial('review/left.phtml'); ?>
+
+
+ msg or $this->messages) :?>
+
+ msg) : ?>
+
msg; ?>
+ messages): foreach($this->messages as $msg): ?>
+
+
+
+
-
-
= $this->paginator; ?>
-
-
\ No newline at end of file
+
+
+
+
+
= $this->paginator; ?>
+
+
\ No newline at end of file
diff --git a/application/admin/views/scripts/review/draft.phtml b/application/admin/views/scripts/review/draft.phtml
index b5cc8fdd..b0e14656 100644
--- a/application/admin/views/scripts/review/draft.phtml
+++ b/application/admin/views/scripts/review/draft.phtml
@@ -2,58 +2,59 @@
$this->headTitle($this->config->title->site);
$this->headTitle('后台管理');
$this->headTitle()->setSeparator(' - ');
- $this->headLink()->appendStylesheet('/css/admin.css');
- $this->headScript()->appendFile('/js/jquery-1.6.4.min.js');
$this->breadcrumb('
首页 ');
$this->breadcrumb('
后台首页 ');
$this->breadcrumb('元数据评审');
$this->breadcrumb()->setSeparator(' > ');
?>
-
-= $this->partial('review/left.phtml'); ?>
-
-
-msg or $this->messages) :?>
-
-msg) : ?>
-
msg; ?>
-messages): foreach($this->messages as $msg): ?>
-
-
-
-
-
-
-
-
-
= $this->paginator; ?>
-
-
\ No newline at end of file
+
+
+
+ = $this->partial('review/left.phtml'); ?>
+
+
+ msg or $this->messages) :?>
+
+ msg) : ?>
+
msg; ?>
+ messages): foreach($this->messages as $msg): ?>
+
+
+
+
+
+
+
= $this->paginator; ?>
+
+
\ No newline at end of file
diff --git a/application/admin/views/scripts/review/left.phtml b/application/admin/views/scripts/review/left.phtml
index b0853341..95440b31 100644
--- a/application/admin/views/scripts/review/left.phtml
+++ b/application/admin/views/scripts/review/left.phtml
@@ -1,11 +1,11 @@
-
-元数据评审
-投稿元数据
-待审元数据
-在审元数据
-我负责的元数据
-通过评审的元数据
-专家库
-已取消评审的元数据
-元数据评审管理
+
\ No newline at end of file
diff --git a/application/admin/views/scripts/review/myreview.phtml b/application/admin/views/scripts/review/myreview.phtml
index 17831ba2..d96cd1a3 100644
--- a/application/admin/views/scripts/review/myreview.phtml
+++ b/application/admin/views/scripts/review/myreview.phtml
@@ -2,69 +2,75 @@
$this->headTitle($this->config->title->site);
$this->headTitle('后台管理');
$this->headTitle()->setSeparator(' - ');
- $this->headLink()->appendStylesheet('/css/admin.css');
- $this->headScript()->appendFile('/js/jquery-1.7.min.js');
$this->breadcrumb('首页 ');
$this->breadcrumb('后台首页 ');
$this->breadcrumb('元数据评审');
$this->breadcrumb()->setSeparator(' > ');
?>
-
-= $this->partial('review/left.phtml'); ?>
+
+
+
+ = $this->partial('review/left.phtml'); ?>
+
+
+ msg or $this->messages) :?>
+
+ msg) : ?>
+
msg; ?>
+ messages): foreach($this->messages as $msg): ?>
+
+
+
+
+
+
+
+
= $this->paginator; ?>
+
-
-msg or $this->messages) :?>
-
-msg) : ?>
-
msg; ?>
-messages): foreach($this->messages as $msg): ?>
-
-
-
-
-
-
-
-
-
-
= $this->paginator; ?>
-
-
\ No newline at end of file
+
\ No newline at end of file
diff --git a/application/admin/views/scripts/review/reply.phtml b/application/admin/views/scripts/review/reply.phtml
index 382be450..8a218a51 100644
--- a/application/admin/views/scripts/review/reply.phtml
+++ b/application/admin/views/scripts/review/reply.phtml
@@ -2,77 +2,55 @@
$this->headTitle($this->config->title->site);
$this->headTitle('后台管理');
$this->headTitle()->setSeparator(' - ');
- $this->headLink()->appendStylesheet('/css/admin.css');
- $this->headLink()->appendStylesheet('/css/author.css');
- $this->headScript()->appendFile('/js/jquery-1.7.min.js');
$this->breadcrumb('
首页 ');
$this->breadcrumb('
后台首页 ');
$this->breadcrumb('评审意见反馈');
$this->breadcrumb()->setSeparator(' > ');
+ $this->theme->AppendPlus($this,"colorbox");
?>
-
-= $this->partial('review/left.phtml'); ?>
-
-
-msg))
-{
-?>
-
= $this->msg;?>
-jump_url)) {?>
-
-
-
+
+
+ = $this->partial('review/left.phtml'); ?>
+
+
-review))
-{ echo "此数据尚无反馈信息";
-}else{?>
- review as $v)
- {?>
+ review as $v){?>
= empty($v['realname']) ? $v['username'] : $v['realname']?> := $v['mdcomment']?>
-
+
-
反馈给元数据作者
-
+ error)) { ?>
+ = $this->error ?>
+
+
为《= $this->md['title'] ?>》的作者反馈
+
+
-
-
+
diff --git a/application/default/controllers/DataController.php b/application/default/controllers/DataController.php
index 4e683426..276b4cb5 100755
--- a/application/default/controllers/DataController.php
+++ b/application/default/controllers/DataController.php
@@ -11,6 +11,11 @@ class DataController extends Zend_Controller_Action
$this->view->messages = $this->messenger->getMessages();
$this->view->theme = new Theme();
$this->view->main_nav_pageID = "data";
+
+ $this->view->nav = array(
+ array('link'=>'/','title'=>'
'),
+ array('link'=>'/data','title'=>$this->view->config->title->data),
+ );
}
function indexAction()
{
@@ -1851,95 +1856,7 @@ class DataController extends Zend_Controller_Action
}
}
- /*
- * 转换元数据为WORD DOC格式
- */
- public function docAction()
- {
- $this->_helper->layout->disableLayout();
- $this->_helper->viewRenderer->setNoRender();
- $uuid=$this->_request->getParam('uuid');
- $review=$this->_request->getParam('review');
- if (!empty($uuid))
- {
- $sql="select x.data,m.title,m.description,g.id,m.projection from xml x left join metadata m on m.id=x.id left join geonetworkmetadata g on g.uuid=m.uuid where m.uuid=".$this->db->quote($uuid);
- $row=$this->db->fetchRow($sql);
- $sql="select r.* from reference r left join mdref m on m.refid=r.id where m.uuid=?";
- $sql=$this->db->quoteInto($sql,$uuid);
- $ref=$this->db->fetchAll($sql);
- $reference='
';
- foreach($ref as $refer)
- {
- $reference.=''.$refer['reference'].' ';
- }
- $reference.=' ';
- if (is_numeric($row['projection']))
- {
- $sql="select proj4text from spatial_ref_sys where auth_srid=?";
- $rs=$this->db->fetchRow($sql,array($row['projection']));
- if ($rs) $projection=$rs['proj4text'];
- }
- if (empty($projection)) $projection=$row['projection'];
- } else
- $projection='';
-
- $dom = new DOMDocument();
- $dom->loadXML($row['data']);
- //提前对表格进行预处理
- $wiki=new WikiFormat();
- $abs=$wiki->parseTable($this->view->escape($row["description"]));
- //处理外部链接
- $abs=preg_replace('/\[\s*(http:\/\/.+?)\s+(.*?)\]/m','
$2 ',$abs);
- $abs=str_replace(array("\r\n", "\n", "\r"),'
',$abs);
- $abs=str_replace("'","'",$abs);//not needed?
- $id = $row['id'];
- $thumburl=sprintf('%05d',floor(($id+0.1)/100)*100).'-'.sprintf('%05d',ceil(($id+0.1)/100)*100-1)."/".$id;
- $xslt = new XSLTProcessor();
- $xslt->registerPHPFunctions();
- $xslt->setParameter('', 'thumburl', $thumburl);
- $xslt->setParameter('', 'abstract', $abs);
- $xslt->setParameter('','projection',$projection);
- $xslt->setParameter('','reference',$reference);
- $XSL = new DOMDocument();
- $XSL->load( '../data/doc.xsl', LIBXML_NOCDATA);
- $xslt->importStylesheet($XSL);
- $content='
-
';
- $content.='
'.$row['title'].' ';
- $content.='
-
- ';
- $content.=$xslt->transformToXML($dom);
- if ($review==1) $content.=file_get_contents('../data/review-table.htm',true);
- $content.="";
- $this->getResponse()->setHeader('Content-Type', 'application/vnd.ms-doc')
- ->setHeader('Content-Disposition','attachment; filename="'.$row['title'].'.doc"')
- ->setHeader('Content-Length', strlen($content))
- ->setHeader('Content-Type','application/force-download')
- ->setHeader('Content-Type','application/download')
- ->setHeader('Content-Description','File Transfer')
- ->setHeader('Content-Transfer-Encoding','binary')
- ->setHeader('Expires',0)
- ->setHeader('Cache-Control','must-revalidate, post-check=0, pre-check=0')
- ->setHeader('Pragma','public')
- ->setBody($content);
- }
+
public function jsonexit($data){
$this->getResponse()->setHeader('Content-Type', 'application/json')->appendBody(json_encode($data,JSON_NUMERIC_CHECK));
@@ -1999,6 +1916,112 @@ class DataController extends Zend_Controller_Action
$this->view->paginator=$paginator;
$this->_helper->viewRenderer('fund-list');
}
- }
+ }
+
+ //实现基于DOI信息的浏览
+ function doiAction()
+ {
+ $ac = $this->_request->getParam('ac');
+ if ($ac=='unready') {
+ //列出没有DOI的数据
+ $sql="select m.* from normalmetadata m where length(m.doi)<3 and m.uuid not in (select uuid from datadoi) order by m.ts_created desc";
+ $this->view->pageID='doi-unready';
+ } else if ($ac=='prepare') {
+ //列出有DOI但还未进行提交申请的数据
+ $sql="select m.* from normalmetadata m where length(m.doi)>3 and m.uuid not in (select uuid from datadoi) order by m.ts_created desc";
+ $this->view->pageID='doi-prepare';
+ } else if ($ac=='unsubmit') {
+ //列出有DOI并计划提交申请的数据
+ $sql="select m.*,d.doi as datadoi,date(d.ts_created) as ts_created from normalmetadata m left join datadoi d on m.uuid=d.uuid where length(m.doi)>3 and d.ts_created is not null and d.ts_submitted is null order by d.ts_created desc";
+ $this->view->pageID='doi-unsubmit';
+ } else if ($ac=='submit') {
+ //列出有DOI并计划提交申请的数据
+ $sql="select m.*,d.doi as datadoi,date(d.ts_submitted) as ts_submitted from normalmetadata m left join datadoi d on m.uuid=d.uuid where length(m.doi)>3 and d.ts_submitted is not null and d.ts_published is null order by d.ts_submitted desc,d.ts_created desc";
+ $this->view->pageID='doi-submit';
+ } else if ($ac=='publish' || empty($ac)) {
+ //默认:列出最新发布的DOI数据
+ $sql="select m.*,d.doi as datadoi,date(d.ts_submitted) as ts_submitted,date(d.ts_published) as ts_published from normalmetadata m left join datadoi d on m.uuid=d.uuid where length(m.doi)>3 and d.ts_published is not null order by d.ts_published desc,d.ts_submitted desc,d.ts_created desc";
+ $this->view->pageID='doi-publish';
+ }
+ $sth = $this->db->prepare($sql);
+ $sth->execute();
+ $rows = $sth->fetchAll();
+ $paginator = Zend_Paginator::factory($rows);
+ $paginator->setCurrentPageNumber($this->_getParam('page'));
+ $paginator->setItemCountPerPage(10);
+ $paginator->setView($this->view);
+ Zend_View_Helper_PaginationControl::setDefaultViewPartial('pagination_param.phtml');
+ $this->view->paginator=$paginator;
+ }
+
+ //基于数据作者的浏览(包括认证后的数据作者以及未认证的数据作者)
+ function authorAction()
+ {
+ $ac = $this->_request->getParam('ac');
+ $id = (int)$this->_request->getParam('id');
+ if ($ac=='verified') {
+ //已经认证过的数据作者
+ $this->view->pageID='author-verified';
+ $this->view->ac='verified';
+ if ($id) {
+ //列出作者的数据
+ $sql="select username,realname from users where id=?";
+ $this->view->author=$this->db->fetchRow($sql,array($id));
+ $sql="select m.* from normalmetadata m left join mdauthor a on a.uuid=m.uuid where a.userid=?";
+ $sth = $this->db->prepare($sql);
+ $sth->execute(array($id));
+ $rows = $sth->fetchAll();
+ $paginator = Zend_Paginator::factory($rows);
+ $paginator->setCurrentPageNumber($this->_getParam('page'));
+ $paginator->setItemCountPerPage(10);
+ $paginator->setView($this->view);
+ Zend_View_Helper_PaginationControl::setDefaultViewPartial('pagination_param.phtml');
+ $this->view->paginator=$paginator;
+ } else {
+ //已经认证过的数据作者
+ $sql="select u.username,u.realname,u.id,count(u.id) as count from mdauthor a left join users u on a.userid=u.id where a.status=1 and a.uuid in (select uuid from normalmetadata) group by u.id,u.username,u.realname";
+ $sth = $this->db->prepare($sql);
+ $sth->execute();
+ $rows = $sth->fetchAll();
+ $paginator = Zend_Paginator::factory($rows);
+ $paginator->setCurrentPageNumber($this->_getParam('page'));
+ $paginator->setItemCountPerPage(50);
+ $paginator->setView($this->view);
+ Zend_View_Helper_PaginationControl::setDefaultViewPartial('pagination_param.phtml');
+ $this->view->paginator=$paginator;
+ }
+ } else if ($ac=='unverified' || empty($ac)) {
+ //未认证的数据作者
+ $this->view->pageID='author-unverified';
+ $this->view->ac='unverified';
+ if ($id) {
+ //列出数据
+ $sql="select individual as username from responsible where id=?";
+ $this->view->author=$this->db->fetchRow($sql,array($id));
+ $sql="select distinct m.* from normalmetadata m left join role r on m.uuid=r.uuid left join responsible s on r.resid=s.id where r.role in ('pointOfContact','resourceProvider','owner') and s.id=?";
+ $sth = $this->db->prepare($sql);
+ $sth->execute(array($id));
+ $rows = $sth->fetchAll();
+ $paginator = Zend_Paginator::factory($rows);
+ $paginator->setCurrentPageNumber($this->_getParam('page'));
+ $paginator->setItemCountPerPage(10);
+ $paginator->setView($this->view);
+ Zend_View_Helper_PaginationControl::setDefaultViewPartial('pagination_param.phtml');
+ $this->view->paginator=$paginator;
+ } else {
+ //列出所有作者
+ $sql="select distinct responsible.individual as username,responsible.id from responsible left join role on role.resid=responsible.id where role.role in ('pointOfContact','resourceProvider','owner')";
+ $sth = $this->db->prepare($sql);
+ $sth->execute();
+ $rows = $sth->fetchAll();
+ $paginator = Zend_Paginator::factory($rows);
+ $paginator->setCurrentPageNumber($this->_getParam('page'));
+ $paginator->setItemCountPerPage(50);
+ $paginator->setView($this->view);
+ Zend_View_Helper_PaginationControl::setDefaultViewPartial('pagination_param.phtml');
+ $this->view->paginator=$paginator;
+ }
+ }
+ }
}
diff --git a/application/default/views/scripts/breadcrumbs.phtml b/application/default/views/scripts/breadcrumbs.phtml
new file mode 100644
index 00000000..91aa0034
--- /dev/null
+++ b/application/default/views/scripts/breadcrumbs.phtml
@@ -0,0 +1,11 @@
+nav)){ ?>
+
+
+
+
\ No newline at end of file
diff --git a/application/default/views/scripts/data/author.phtml b/application/default/views/scripts/data/author.phtml
new file mode 100644
index 00000000..e2770f38
--- /dev/null
+++ b/application/default/views/scripts/data/author.phtml
@@ -0,0 +1,65 @@
+headTitle($this->config->title->site);
+$this->headTitle($this->config->title->data);
+$this->headTitle('数据作者浏览');
+$this->headTitle()->setSeparator(' - ');
+$this->nav[] = array('link'=>"/data/author",'title'=>'数据作者浏览');
+$this->theme->AppendPlus($this,'colorbox');
+?>
+
+= $this->render('breadcrumbs.phtml') ?>
+= $this->partial('data/tools.phtml'); ?>
+
+
+author) : ?>
+paginator)) : ?>
+
= $this->paginator; ?>
+paginator as $md) : ?>
+
+
+
= $this->paginator; ?>
+
+
+paginator)) : ?>
+
= $this->paginator; ?>
+
+
+
+
+
diff --git a/application/default/views/scripts/data/browse.phtml b/application/default/views/scripts/data/browse.phtml
index 76181c95..d6d3fce2 100755
--- a/application/default/views/scripts/data/browse.phtml
+++ b/application/default/views/scripts/data/browse.phtml
@@ -4,20 +4,19 @@
$this->headTitle('全部浏览');
$this->headTitle()->setSeparator(' - ');
$this->headLink()->appendStylesheet('/css/metadata.css');
-$this->breadcrumb('
首页 ');
-$this->breadcrumb('
'.$this->config->title->data.' ');
-$this->breadcrumb('浏览');
-$this->breadcrumb()->setSeparator(' > ');
+$this->nav[] = array('link'=>"/data/browse",'title'=>'全部浏览');
+$this->theme->AppendPlus($this,'colorbox');
?>
+= $this->render('breadcrumbs.phtml'); ?>
= $this->partial('data/tools.phtml'); ?>
page->getNavigation(); ?>
metadata as $md) : ?>
-page->getNavigation(); ?>
\ No newline at end of file
+page->getNavigation(); ?>
+
+
\ No newline at end of file
diff --git a/application/default/views/scripts/data/category.phtml b/application/default/views/scripts/data/category.phtml
index a70ad720..9f7ec15f 100755
--- a/application/default/views/scripts/data/category.phtml
+++ b/application/default/views/scripts/data/category.phtml
@@ -4,13 +4,10 @@
$this->headTitle('分类浏览');
if (!empty($this->codename)) $this->headTitle($this->codename);
$this->headTitle()->setSeparator(' - ');
-$this->breadcrumb('
首页 ');
-$this->breadcrumb('
'.$this->config->title->data.' ');
-$this->breadcrumb('
分类浏览 ');
-if (!empty($this->codename)) $this->breadcrumb($this->codename);
-$this->breadcrumb()->setSeparator(' > ');
+$this->nav[] = array('link'=>"/data/category",'title'=>'分类浏览');
?>
+ = $this->render('breadcrumbs.phtml'); ?>
= $this->partial('data/tools.phtml'); ?>
diff --git a/application/default/views/scripts/data/doi.phtml b/application/default/views/scripts/data/doi.phtml
new file mode 100644
index 00000000..9762ec3f
--- /dev/null
+++ b/application/default/views/scripts/data/doi.phtml
@@ -0,0 +1,54 @@
+headTitle($this->config->title->site);
+$this->headTitle($this->config->title->data);
+$this->headTitle('DOI浏览');
+$this->headTitle()->setSeparator(' - ');
+$this->nav[] = array('link'=>"/data/doi",'title'=>'DOI浏览');
+$this->theme->AppendPlus($this,'colorbox');
+?>
+
+= $this->render('breadcrumbs.phtml') ?>
+= $this->partial('data/tools.phtml'); ?>
+
+
+paginator)) : ?>
+
= $this->paginator; ?>
+paginator as $md) : ?>
+
+
+
= $this->paginator; ?>
+
+暂无对应信息。
+
+
diff --git a/application/default/views/scripts/data/fund-list.phtml b/application/default/views/scripts/data/fund-list.phtml
index 345ae63d..f1adff0a 100644
--- a/application/default/views/scripts/data/fund-list.phtml
+++ b/application/default/views/scripts/data/fund-list.phtml
@@ -3,13 +3,10 @@ $this->headTitle($this->config->title->site);
$this->headTitle($this->config->title->data);
$this->headTitle('支持项目');
$this->headTitle()->setSeparator(' - ');
-$this->breadcrumb('
首页 ');
-$this->breadcrumb('
'.$this->config->title->data.' ');
-$this->breadcrumb('
支持项目 ');
-$this->breadcrumb()->setSeparator(' > ');
+$this->nav[] = array('link'=>"/data/fund",'title'=>'支持项目浏览');
?>
-
-
= $this->breadcrumb() ?>
+
+= $this->render('breadcrumbs.phtml') ?>
= $this->partial('data/tools.phtml'); ?>
diff --git a/application/default/views/scripts/data/fund.phtml b/application/default/views/scripts/data/fund.phtml
index 2541fbe3..28a2179a 100644
--- a/application/default/views/scripts/data/fund.phtml
+++ b/application/default/views/scripts/data/fund.phtml
@@ -3,13 +3,11 @@ $this->headTitle($this->config->title->site);
$this->headTitle($this->config->title->data);
$this->headTitle('支持项目');
$this->headTitle()->setSeparator(' - ');
-$this->breadcrumb('
首页 ');
-$this->breadcrumb('
'.$this->config->title->data.' ');
-$this->breadcrumb('
支持项目 ');
-$this->breadcrumb()->setSeparator(' > ');
+$this->nav[] = array('link'=>"/data/fund",'title'=>'支持项目浏览');
+$this->theme->AppendPlus($this,'colorbox');
?>
-
-
= $this->breadcrumb() ?>
+
+= $this->render('breadcrumbs.phtml') ?>
= $this->partial('data/tools.phtml'); ?>
@@ -21,7 +19,7 @@ $this->breadcrumb()->setSeparator(' > ');
= $this->paginator; ?>
paginator as $md) : ?>
-
+
@@ -34,3 +32,9 @@ $this->breadcrumb()->setSeparator(' > ');
暂无对应信息。
+
\ No newline at end of file
diff --git a/application/default/views/scripts/data/index.phtml b/application/default/views/scripts/data/index.phtml
index 8fc850b9..7bc90f96 100755
--- a/application/default/views/scripts/data/index.phtml
+++ b/application/default/views/scripts/data/index.phtml
@@ -39,8 +39,9 @@ $this->headTitle()->setSeparator(' - ');
时空浏览
单位浏览
项目浏览
-
作者浏览
+
作者浏览
文献浏览
+
DOI浏览
headTitle("空间浏览");
$this->headTitle()->setSeparator(' - ');
$this->headLink()->appendStylesheet('/css/metadata.css');
- $this->breadcrumb('
首页 ');
- $this->breadcrumb('
'.$this->config->title->data.' ');
- $this->breadcrumb('
空间浏览 ');
- if (!empty($this->codename)) $this->breadcrumb($this->codename);
- $this->breadcrumb()->setSeparator(' > ');
$this->headScript()->appendFile('http://maps.google.com/maps/api/js?sensor=false');
$this->headScript()->appendFile('/js/OpenLayers.js');
- $this->headLink()->appendStylesheet('/js/theme/default/style.css');
+ $this->headLink()->appendStylesheet('/js/theme/default/style.css');
+$this->nav[] = array('link'=>"/data/map",'title'=>'空间导航');
?>
-
+
+= $this->render('breadcrumbs.phtml'); ?>
= $this->partial('data/tools.phtml'); ?>
diff --git a/application/default/views/scripts/data/organization.phtml b/application/default/views/scripts/data/organization.phtml
index c897001b..e2f5d6fa 100644
--- a/application/default/views/scripts/data/organization.phtml
+++ b/application/default/views/scripts/data/organization.phtml
@@ -4,15 +4,11 @@
$this->headTitle('分单位浏览');
if (!empty($this->codename)) $this->headTitle($this->codename);
$this->headTitle()->setSeparator(' - ');
-$this->breadcrumb('
首页 ');
-$this->breadcrumb('
'.$this->config->title->data.' ');
-$this->breadcrumb('
分单位浏览 ');
-if (!empty($this->codename)) $this->breadcrumb($this->codename);
-$this->breadcrumb()->setSeparator(' > ');
-?>
-
+$this->nav[] = array('link'=>"/data/organization",'title'=>'分单位浏览');
+$this->theme->AppendPlus($this,'colorbox');
+?>
-
= $this->breadcrumb() ?>
+= $this->render('breadcrumbs.phtml') ?>
= $this->partial('data/tools.phtml'); ?>
@@ -22,7 +18,7 @@ $this->breadcrumb()->setSeparator(' > ');
paginator as $md) : ?>
-
+
@@ -40,4 +36,10 @@ $this->breadcrumb()->setSeparator(' > ');
'>
-
\ No newline at end of file
+
+
\ No newline at end of file
diff --git a/application/default/views/scripts/data/series.phtml b/application/default/views/scripts/data/series.phtml
index d3f62bf5..859cea9c 100755
--- a/application/default/views/scripts/data/series.phtml
+++ b/application/default/views/scripts/data/series.phtml
@@ -1,17 +1,14 @@
headTitle($this->config->title->site);
$this->headTitle($this->config->title->data);
-$this->headTitle('数据集序列');
+$this->headTitle('数据集序列序列');
$this->headTitle($this->codename);
$this->headTitle()->setSeparator(' - ');
$this->headLink()->appendStylesheet('/css/metadata.css');
-$this->breadcrumb('
首页 ');
-$this->breadcrumb('
'.$this->config->title->data.' ');
-$this->breadcrumb('
数据集浏览 ');
-if (!empty($this->codename)) $this->breadcrumb($this->codename);
-$this->breadcrumb()->setSeparator(' > ');
+$this->nav[] = array('link'=>"/data/series",'title'=>'数据集序列浏览');
?>
+= $this->render('breadcrumbs.phtml'); ?>
= $this->partial('data/tools.phtml'); ?>
diff --git a/application/default/views/scripts/data/tag.phtml b/application/default/views/scripts/data/tag.phtml
index 68d8cb96..592d1578 100755
--- a/application/default/views/scripts/data/tag.phtml
+++ b/application/default/views/scripts/data/tag.phtml
@@ -4,14 +4,11 @@ $this->headTitle($this->config->title->data);
if (!empty($this->codename)) $this->headTitle($this->codename);
$this->headTitle()->setSeparator(' - ');
$this->headLink()->appendStylesheet('/css/metadata.css');
-$this->breadcrumb('
首页 ');
-$this->breadcrumb('
'.$this->config->title->data.' ');
-$this->breadcrumb('
关键词浏览 ');
-if (!empty($this->codename)) $this->breadcrumb($this->codename);
-$this->breadcrumb()->setSeparator(' > ');
+$this->nav[] = array('link'=>"/data/tag",'title'=>'关键词浏览');
$this->theme->AppendPlus($this,'colorbox');
?>
+= $this->render('breadcrumbs.phtml') ?>
= $this->partial('data/tools.phtml'); ?>
metadata)) : ?>
@@ -55,5 +52,8 @@ foreach($this->keywords as $cg) :
diff --git a/application/default/views/scripts/data/thumb.phtml b/application/default/views/scripts/data/thumb.phtml
index 801ec9be..40616626 100644
--- a/application/default/views/scripts/data/thumb.phtml
+++ b/application/default/views/scripts/data/thumb.phtml
@@ -3,15 +3,13 @@ $this->headTitle($this->config->title->site);
$this->headTitle($this->config->title->data);
$this->headTitle('缩略图浏览');
$this->headTitle()->setSeparator(' - ');
-$this->headLink()->appendStylesheet('/css/water.css');
-$this->breadcrumb('
首页 ');
-$this->breadcrumb('
'.$this->config->title->data.' ');
-$this->breadcrumb('缩略图浏览');
-$this->breadcrumb()->setSeparator(' > ');
+$this->headLink()->appendStylesheet('/css/water.css');
+$this->nav[] = array('link'=>"/data/thumb",'title'=>'缩略图浏览');
$this->theme->AppendPlus($this,'masonry');
$this->theme->AppendPlus($this,'colorbox');
?>
-
+
+ = $this->render('breadcrumbs.phtml') ?>
page->getNavigation(); ?>
metadata as $md) : ?>
@@ -32,15 +30,12 @@ $this->theme->AppendPlus($this,'colorbox');
page->getNavigation(); ?>
-
\ No newline at end of file
diff --git a/application/default/views/scripts/data/timeline.phtml b/application/default/views/scripts/data/timeline.phtml
index fb689757..e689961d 100755
--- a/application/default/views/scripts/data/timeline.phtml
+++ b/application/default/views/scripts/data/timeline.phtml
@@ -4,15 +4,12 @@ $this->headTitle($this->config->title->data);
$this->headTitle('时间轴导航');
$this->headTitle()->setSeparator(' - ');
$this->headLink()->appendStylesheet('/css/metadata.css');
-$this->breadcrumb('
首页 ');
-$this->breadcrumb('
'.$this->config->title->data.' ');
-$this->breadcrumb('
时间轴导航 ');
-$this->breadcrumb()->setSeparator(' > ');
$this->headScript()->appendFile('/js/timeline_var.js');
$this->headScript()->appendFile('/js/timeline_js/timeline-api.js?bundle=true');
-$this->headScript()->appendFile('/js/time.js');
+$this->headScript()->appendFile('/js/time.js');
+$this->nav[] = array('link'=>"/data/timeline",'title'=>'时间轴导航');
?>
-
= $this->partial('data/tools.phtml'); ?>
+
= $this->render('breadcrumbs.phtml'); ?>= $this->partial('data/tools.phtml'); ?>
-
+ url == -1) { ?>
+
如果没有跳转请点击这样
+
+
+
如果没有跳转请点击这样
+
+
\ No newline at end of file
diff --git a/application/default/views/scripts/water/view.phtml b/application/default/views/scripts/water/view.phtml
index 67918ac9..ec676eb8 100755
--- a/application/default/views/scripts/water/view.phtml
+++ b/application/default/views/scripts/water/view.phtml
@@ -28,12 +28,17 @@ if ($md->title_en) echo ' '.$this->escape($md->title_en);?>
- citation) : ?>
-
-
-
escape($md->citation);?>
-
- ref) : ?>
+ citation) : ?>
+
+
+
datadoi) || !strpos($md->citation,$md->datadoi)) : ?>文章的引用
+ escape($md->citation);?>
+ datadoi) && !strpos($md->citation,$md->datadoi)) : ?>
+
数据的引用 authors,1,-1).'. '.$md->title.'. '.$md->publisher.', '.$md->publish_year.'. doi:'.$md->doi;
+ echo ' ['.substr($md->author_en,1,-1).'. '.$md->title_en.'. '.$md->publisher_en.', '.$md->publish_year.'. doi:'.$md->doi.']';
+ ?> (下载引用:RIS格式 | RIS英文格式 | Bibtex格式 | Bibtex英文格式 )
+ ref) : ?>
建议参考文献
diff --git a/application/default/views/scripts/yrnmr/view.phtml b/application/default/views/scripts/yrnmr/view.phtml
index a4179bd0..92d7d197 100755
--- a/application/default/views/scripts/yrnmr/view.phtml
+++ b/application/default/views/scripts/yrnmr/view.phtml
@@ -36,12 +36,17 @@ if ($md->title_en) echo ' '.$this->escape($md->title_en);?>
- citation) : ?>
-
-
-
escape($md->citation);?>
-
- ref) : ?>
+ citation) : ?>
+
+
+
datadoi) || !strpos($md->citation,$md->datadoi)) : ?>文章的引用
+ escape($md->citation);?>
+ datadoi) && !strpos($md->citation,$md->datadoi)) : ?>
+
数据的引用 authors,1,-1).'. '.$md->title.'. '.$md->publisher.', '.$md->publish_year.'. doi:'.$md->doi;
+ echo ' ['.substr($md->author_en,1,-1).'. '.$md->title_en.'. '.$md->publisher_en.', '.$md->publish_year.'. doi:'.$md->doi.']';
+ ?> (下载引用:RIS格式 | RIS英文格式 | Bibtex格式 | Bibtex英文格式 )
+ ref) : ?>
建议参考文献
diff --git a/application/models/data/Author.php b/application/models/data/Author.php
index 8cb14eab..6a133754 100644
--- a/application/models/data/Author.php
+++ b/application/models/data/Author.php
@@ -7,6 +7,7 @@ class Author extends Zend_Controller_Plugin_Abstract
//使用到的公共变量
public $tbl_metadata = "metadata"; //元数据
public $tbl_author = "mdauthor"; //数据作者表
+ public $tbl_user = "users";
function __construct($db)
{
@@ -41,6 +42,29 @@ class Author extends Zend_Controller_Plugin_Abstract
return false;
}
}
+
+ //获取某数据的所有作者
+ function getAuthor($uuid,$field = "")
+ {
+ $sql = "SELECT md.title,u.email FROM ".$this->tbl_metadata." md
+ LEFT JOIN ".$this->tbl_author." a ON md.uuid=a.uuid
+ LEFT JOIN ".$this->tbl_user." u ON a.userid=u.id
+ WHERE md.uuid='$uuid'";
+ $sth = $this->db->query($sql);
+ $rows = $sth->fetchAll();
+
+ if(empty($field))
+ {
+ return $rows;
+ }else{
+ $datas = array();
+ foreach($rows as $k=>$v)
+ {
+ $datas[] = $v[$field];
+ }
+ return $datas;
+ }
+ }
}
class Literature extends Author
diff --git a/application/models/data/Review.php b/application/models/data/Review.php
index 9a720450..80a0f49e 100644
--- a/application/models/data/Review.php
+++ b/application/models/data/Review.php
@@ -5,7 +5,9 @@ class Review extends Zend_Controller_Plugin_Abstract
private $auth = NULL; //Zend_Auth 对象
//使用到的公共变量
- public $tbl_review = "mdexpertreview";
+ public $tbl_reviewexp = "mdexpertreview";
+ public $tbl_mdreview = "mdreview";
+ public $tbl_user = "users";
function __construct($db)
{
@@ -26,7 +28,7 @@ class Review extends Zend_Controller_Plugin_Abstract
}//非本人操作
try{
- $sql = "update ".$this->tbl_review." set status=$status where id='$id' and uuid='$uuid'";
+ $sql = "update ".$this->tbl_reviewexp." set status=$status where id='$id' and uuid='$uuid'";
if($this->db->exec($sql))
{
return true;
@@ -36,6 +38,18 @@ class Review extends Zend_Controller_Plugin_Abstract
}catch(Exception $e){
return "处理中出现错误";
}
+ }
+
+ //根据UUID获得评审意见
+ function getReviews($uuid)
+ {
+ $sql = "SELECT mr.*,u.username,u.realname FROM ".$this->tbl_mdreview." mr
+ LEFT JOIN ".$this->tbl_user." u ON mr.userid = u.id
+ WHERE mr.uuid = '$uuid'";
+ $sth = $this->db->query($sql);
+ $reviews = $sth->fetchAll();
+
+ return $reviews;
}
}
diff --git a/htdocs/css/admin.css b/htdocs/css/admin.css
index 59d19064..730e6568 100644
--- a/htdocs/css/admin.css
+++ b/htdocs/css/admin.css
@@ -14,7 +14,6 @@ body,div,dl,dt,dd,ul,ol,li,h1,h2,h3,h4,h5,h6,pre,code,form,fieldset,legend,input
fieldset,img{border:none;}
address,caption,cite,code,dfn,em,strong,th,var{font-style:normal;font-weight:normal;}
caption,th{text-align:left;}
-h1,h2,h3,h4,h5,h6{font-size:100%;font-weight:normal;}
table{border-collapse:collapse;border-spacing:0;}
table td,table th{border:1px solid #0a3e68;}
table tr td,table th{line-height:24px;}
diff --git a/htdocs/js/lib/bootstrap/css/font-awesome-ie7.min.css b/htdocs/js/lib/bootstrap/css/font-awesome-ie7.min.css
index ae301609..47e05082 100644
--- a/htdocs/js/lib/bootstrap/css/font-awesome-ie7.min.css
+++ b/htdocs/js/lib/bootstrap/css/font-awesome-ie7.min.css
@@ -1,22 +1,24 @@
/*!
- * Font Awesome 3.0.2
- * the iconic font designed for use with Twitter Bootstrap
+ * Font Awesome 3.1.0
+ * the iconic font designed for Bootstrap
* -------------------------------------------------------
* The full suite of pictographic icons, examples, and documentation
- * can be found at: http://fortawesome.github.com/Font-Awesome/
+ * can be found at: http://fontawesome.io
*
* License
* -------------------------------------------------------
- * - The Font Awesome font is licensed under the SIL Open Font License - http://scripts.sil.org/OFL
+ * - The Font Awesome font is licensed under the SIL Open Font License v1.1 -
+ * http://scripts.sil.org/OFL
* - Font Awesome CSS, LESS, and SASS files are licensed under the MIT License -
* http://opensource.org/licenses/mit-license.html
- * - The Font Awesome pictograms are licensed under the CC BY 3.0 License - http://creativecommons.org/licenses/by/3.0/
+ * - Font Awesome documentation licensed under CC BY 3.0 License -
+ * http://creativecommons.org/licenses/by/3.0/
* - Attribution is no longer required in Font Awesome 3.0, but much appreciated:
- * "Font Awesome by Dave Gandy - http://fortawesome.github.com/Font-Awesome"
+ * "Font Awesome by Dave Gandy - http://fontawesome.io"
* Contact
* -------------------------------------------------------
- * Email: dave@davegandy.com
+ * Email: dave@fontawesome.io
* Twitter: http://twitter.com/fortaweso_me
* Work: Lead Product Designer @ http://kyruus.com
- */.icon-large{font-size:1.3333333333333333em;margin-top:-4px;padding-top:3px;margin-bottom:-4px;padding-bottom:3px;vertical-align:middle}.nav [class^="icon-"],.nav [class*=" icon-"]{vertical-align:inherit;margin-top:-4px;padding-top:3px;margin-bottom:-4px;padding-bottom:3px}.nav [class^="icon-"].icon-large,.nav [class*=" icon-"].icon-large{vertical-align:-25%}.nav-pills [class^="icon-"].icon-large,.nav-tabs [class^="icon-"].icon-large,.nav-pills [class*=" icon-"].icon-large,.nav-tabs [class*=" icon-"].icon-large{line-height:.75em;margin-top:-7px;padding-top:5px;margin-bottom:-5px;padding-bottom:4px}.btn [class^="icon-"].pull-left,.btn [class*=" icon-"].pull-left,.btn [class^="icon-"].pull-right,.btn [class*=" icon-"].pull-right{vertical-align:inherit}.btn [class^="icon-"].icon-large,.btn [class*=" icon-"].icon-large{margin-top:-0.5em}a [class^="icon-"],a [class*=" icon-"]{cursor:pointer}ul.icons{text-indent:-1.5em;margin-left:3em}.icon-glass{*zoom:expression(this.runtimeStyle['zoom'] = '1',this.innerHTML = '')}.icon-music{*zoom:expression(this.runtimeStyle['zoom'] = '1',this.innerHTML = '')}.icon-search{*zoom:expression(this.runtimeStyle['zoom'] = '1',this.innerHTML = '')}.icon-envelope{*zoom:expression(this.runtimeStyle['zoom'] = '1',this.innerHTML = '')}.icon-heart{*zoom:expression(this.runtimeStyle['zoom'] = '1',this.innerHTML = '')}.icon-star{*zoom:expression(this.runtimeStyle['zoom'] = '1',this.innerHTML = '')}.icon-star-empty{*zoom:expression(this.runtimeStyle['zoom'] = '1',this.innerHTML = '')}.icon-user{*zoom:expression(this.runtimeStyle['zoom'] = '1',this.innerHTML = '')}.icon-film{*zoom:expression(this.runtimeStyle['zoom'] = '1',this.innerHTML = '')}.icon-th-large{*zoom:expression(this.runtimeStyle['zoom'] = '1',this.innerHTML = '')}.icon-th{*zoom:expression(this.runtimeStyle['zoom'] = '1',this.innerHTML = '')}.icon-th-list{*zoom:expression(this.runtimeStyle['zoom'] = '1',this.innerHTML = '')}.icon-ok{*zoom:expression(this.runtimeStyle['zoom'] = '1',this.innerHTML = '')}.icon-remove{*zoom:expression(this.runtimeStyle['zoom'] = '1',this.innerHTML = '')}.icon-zoom-in{*zoom:expression(this.runtimeStyle['zoom'] = '1',this.innerHTML = '')}.icon-zoom-out{*zoom:expression(this.runtimeStyle['zoom'] = '1',this.innerHTML = '')}.icon-off{*zoom:expression(this.runtimeStyle['zoom'] = '1',this.innerHTML = '')}.icon-signal{*zoom:expression(this.runtimeStyle['zoom'] = '1',this.innerHTML = '')}.icon-cog{*zoom:expression(this.runtimeStyle['zoom'] = '1',this.innerHTML = '')}.icon-trash{*zoom:expression(this.runtimeStyle['zoom'] = '1',this.innerHTML = '')}.icon-home{*zoom:expression(this.runtimeStyle['zoom'] = '1',this.innerHTML = '')}.icon-file{*zoom:expression(this.runtimeStyle['zoom'] = '1',this.innerHTML = '')}.icon-time{*zoom:expression(this.runtimeStyle['zoom'] = '1',this.innerHTML = '')}.icon-road{*zoom:expression(this.runtimeStyle['zoom'] = '1',this.innerHTML = '')}.icon-download-alt{*zoom:expression(this.runtimeStyle['zoom'] = '1',this.innerHTML = '')}.icon-download{*zoom:expression(this.runtimeStyle['zoom'] = '1',this.innerHTML = '')}.icon-upload{*zoom:expression(this.runtimeStyle['zoom'] = '1',this.innerHTML = '')}.icon-inbox{*zoom:expression(this.runtimeStyle['zoom'] = '1',this.innerHTML = '')}.icon-play-circle{*zoom:expression(this.runtimeStyle['zoom'] = '1',this.innerHTML = '')}.icon-repeat{*zoom:expression(this.runtimeStyle['zoom'] = '1',this.innerHTML = '')}.icon-refresh{*zoom:expression(this.runtimeStyle['zoom'] = '1',this.innerHTML = '')}.icon-list-alt{*zoom:expression(this.runtimeStyle['zoom'] = '1',this.innerHTML = '')}.icon-lock{*zoom:expression(this.runtimeStyle['zoom'] = '1',this.innerHTML = '')}.icon-flag{*zoom:expression(this.runtimeStyle['zoom'] = '1',this.innerHTML = '')}.icon-headphones{*zoom:expression(this.runtimeStyle['zoom'] = '1',this.innerHTML = '')}.icon-volume-off{*zoom:expression(this.runtimeStyle['zoom'] = '1',this.innerHTML = '')}.icon-volume-down{*zoom:expression(this.runtimeStyle['zoom'] = '1',this.innerHTML = '')}.icon-volume-up{*zoom:expression(this.runtimeStyle['zoom'] = '1',this.innerHTML = '')}.icon-qrcode{*zoom:expression(this.runtimeStyle['zoom'] = '1',this.innerHTML = '')}.icon-barcode{*zoom:expression(this.runtimeStyle['zoom'] = '1',this.innerHTML = '')}.icon-tag{*zoom:expression(this.runtimeStyle['zoom'] = '1',this.innerHTML = '')}.icon-tags{*zoom:expression(this.runtimeStyle['zoom'] = '1',this.innerHTML = '')}.icon-book{*zoom:expression(this.runtimeStyle['zoom'] = '1',this.innerHTML = '')}.icon-bookmark{*zoom:expression(this.runtimeStyle['zoom'] = '1',this.innerHTML = '')}.icon-print{*zoom:expression(this.runtimeStyle['zoom'] = '1',this.innerHTML = '')}.icon-camera{*zoom:expression(this.runtimeStyle['zoom'] = '1',this.innerHTML = '')}.icon-font{*zoom:expression(this.runtimeStyle['zoom'] = '1',this.innerHTML = '')}.icon-bold{*zoom:expression(this.runtimeStyle['zoom'] = '1',this.innerHTML = '')}.icon-italic{*zoom:expression(this.runtimeStyle['zoom'] = '1',this.innerHTML = '')}.icon-text-height{*zoom:expression(this.runtimeStyle['zoom'] = '1',this.innerHTML = '')}.icon-text-width{*zoom:expression(this.runtimeStyle['zoom'] = '1',this.innerHTML = '')}.icon-align-left{*zoom:expression(this.runtimeStyle['zoom'] = '1',this.innerHTML = '')}.icon-align-center{*zoom:expression(this.runtimeStyle['zoom'] = '1',this.innerHTML = '')}.icon-align-right{*zoom:expression(this.runtimeStyle['zoom'] = '1',this.innerHTML = '')}.icon-align-justify{*zoom:expression(this.runtimeStyle['zoom'] = '1',this.innerHTML = '')}.icon-list{*zoom:expression(this.runtimeStyle['zoom'] = '1',this.innerHTML = '')}.icon-indent-left{*zoom:expression(this.runtimeStyle['zoom'] = '1',this.innerHTML = '')}.icon-indent-right{*zoom:expression(this.runtimeStyle['zoom'] = '1',this.innerHTML = '')}.icon-facetime-video{*zoom:expression(this.runtimeStyle['zoom'] = '1',this.innerHTML = '')}.icon-picture{*zoom:expression(this.runtimeStyle['zoom'] = '1',this.innerHTML = '')}.icon-pencil{*zoom:expression(this.runtimeStyle['zoom'] = '1',this.innerHTML = '')}.icon-map-marker{*zoom:expression(this.runtimeStyle['zoom'] = '1',this.innerHTML = '')}.icon-adjust{*zoom:expression(this.runtimeStyle['zoom'] = '1',this.innerHTML = '')}.icon-tint{*zoom:expression(this.runtimeStyle['zoom'] = '1',this.innerHTML = '')}.icon-edit{*zoom:expression(this.runtimeStyle['zoom'] = '1',this.innerHTML = '')}.icon-share{*zoom:expression(this.runtimeStyle['zoom'] = '1',this.innerHTML = '')}.icon-check{*zoom:expression(this.runtimeStyle['zoom'] = '1',this.innerHTML = '')}.icon-move{*zoom:expression(this.runtimeStyle['zoom'] = '1',this.innerHTML = '')}.icon-step-backward{*zoom:expression(this.runtimeStyle['zoom'] = '1',this.innerHTML = '')}.icon-fast-backward{*zoom:expression(this.runtimeStyle['zoom'] = '1',this.innerHTML = '')}.icon-backward{*zoom:expression(this.runtimeStyle['zoom'] = '1',this.innerHTML = '')}.icon-play{*zoom:expression(this.runtimeStyle['zoom'] = '1',this.innerHTML = '')}.icon-pause{*zoom:expression(this.runtimeStyle['zoom'] = '1',this.innerHTML = '')}.icon-stop{*zoom:expression(this.runtimeStyle['zoom'] = '1',this.innerHTML = '')}.icon-forward{*zoom:expression(this.runtimeStyle['zoom'] = '1',this.innerHTML = '')}.icon-fast-forward{*zoom:expression(this.runtimeStyle['zoom'] = '1',this.innerHTML = '')}.icon-step-forward{*zoom:expression(this.runtimeStyle['zoom'] = '1',this.innerHTML = '')}.icon-eject{*zoom:expression(this.runtimeStyle['zoom'] = '1',this.innerHTML = '')}.icon-chevron-left{*zoom:expression(this.runtimeStyle['zoom'] = '1',this.innerHTML = '')}.icon-chevron-right{*zoom:expression(this.runtimeStyle['zoom'] = '1',this.innerHTML = '')}.icon-plus-sign{*zoom:expression(this.runtimeStyle['zoom'] = '1',this.innerHTML = '')}.icon-minus-sign{*zoom:expression(this.runtimeStyle['zoom'] = '1',this.innerHTML = '')}.icon-remove-sign{*zoom:expression(this.runtimeStyle['zoom'] = '1',this.innerHTML = '')}.icon-ok-sign{*zoom:expression(this.runtimeStyle['zoom'] = '1',this.innerHTML = '')}.icon-question-sign{*zoom:expression(this.runtimeStyle['zoom'] = '1',this.innerHTML = '')}.icon-info-sign{*zoom:expression(this.runtimeStyle['zoom'] = '1',this.innerHTML = '')}.icon-screenshot{*zoom:expression(this.runtimeStyle['zoom'] = '1',this.innerHTML = '')}.icon-remove-circle{*zoom:expression(this.runtimeStyle['zoom'] = '1',this.innerHTML = '')}.icon-ok-circle{*zoom:expression(this.runtimeStyle['zoom'] = '1',this.innerHTML = '')}.icon-ban-circle{*zoom:expression(this.runtimeStyle['zoom'] = '1',this.innerHTML = '')}.icon-arrow-left{*zoom:expression(this.runtimeStyle['zoom'] = '1',this.innerHTML = '')}.icon-arrow-right{*zoom:expression(this.runtimeStyle['zoom'] = '1',this.innerHTML = '')}.icon-arrow-up{*zoom:expression(this.runtimeStyle['zoom'] = '1',this.innerHTML = '')}.icon-arrow-down{*zoom:expression(this.runtimeStyle['zoom'] = '1',this.innerHTML = '')}.icon-share-alt{*zoom:expression(this.runtimeStyle['zoom'] = '1',this.innerHTML = '')}.icon-resize-full{*zoom:expression(this.runtimeStyle['zoom'] = '1',this.innerHTML = '')}.icon-resize-small{*zoom:expression(this.runtimeStyle['zoom'] = '1',this.innerHTML = '')}.icon-plus{*zoom:expression(this.runtimeStyle['zoom'] = '1',this.innerHTML = '')}.icon-minus{*zoom:expression(this.runtimeStyle['zoom'] = '1',this.innerHTML = '')}.icon-asterisk{*zoom:expression(this.runtimeStyle['zoom'] = '1',this.innerHTML = '')}.icon-exclamation-sign{*zoom:expression(this.runtimeStyle['zoom'] = '1',this.innerHTML = '')}.icon-gift{*zoom:expression(this.runtimeStyle['zoom'] = '1',this.innerHTML = '')}.icon-leaf{*zoom:expression(this.runtimeStyle['zoom'] = '1',this.innerHTML = '')}.icon-fire{*zoom:expression(this.runtimeStyle['zoom'] = '1',this.innerHTML = '')}.icon-eye-open{*zoom:expression(this.runtimeStyle['zoom'] = '1',this.innerHTML = '')}.icon-eye-close{*zoom:expression(this.runtimeStyle['zoom'] = '1',this.innerHTML = '')}.icon-warning-sign{*zoom:expression(this.runtimeStyle['zoom'] = '1',this.innerHTML = '')}.icon-plane{*zoom:expression(this.runtimeStyle['zoom'] = '1',this.innerHTML = '')}.icon-calendar{*zoom:expression(this.runtimeStyle['zoom'] = '1',this.innerHTML = '')}.icon-random{*zoom:expression(this.runtimeStyle['zoom'] = '1',this.innerHTML = '')}.icon-comment{*zoom:expression(this.runtimeStyle['zoom'] = '1',this.innerHTML = '')}.icon-magnet{*zoom:expression(this.runtimeStyle['zoom'] = '1',this.innerHTML = '')}.icon-chevron-up{*zoom:expression(this.runtimeStyle['zoom'] = '1',this.innerHTML = '')}.icon-chevron-down{*zoom:expression(this.runtimeStyle['zoom'] = '1',this.innerHTML = '')}.icon-retweet{*zoom:expression(this.runtimeStyle['zoom'] = '1',this.innerHTML = '')}.icon-shopping-cart{*zoom:expression(this.runtimeStyle['zoom'] = '1',this.innerHTML = '')}.icon-folder-close{*zoom:expression(this.runtimeStyle['zoom'] = '1',this.innerHTML = '')}.icon-folder-open{*zoom:expression(this.runtimeStyle['zoom'] = '1',this.innerHTML = '')}.icon-resize-vertical{*zoom:expression(this.runtimeStyle['zoom'] = '1',this.innerHTML = '')}.icon-resize-horizontal{*zoom:expression(this.runtimeStyle['zoom'] = '1',this.innerHTML = '')}.icon-bar-chart{*zoom:expression(this.runtimeStyle['zoom'] = '1',this.innerHTML = '')}.icon-twitter-sign{*zoom:expression(this.runtimeStyle['zoom'] = '1',this.innerHTML = '')}.icon-facebook-sign{*zoom:expression(this.runtimeStyle['zoom'] = '1',this.innerHTML = '')}.icon-camera-retro{*zoom:expression(this.runtimeStyle['zoom'] = '1',this.innerHTML = '')}.icon-key{*zoom:expression(this.runtimeStyle['zoom'] = '1',this.innerHTML = '')}.icon-cogs{*zoom:expression(this.runtimeStyle['zoom'] = '1',this.innerHTML = '')}.icon-comments{*zoom:expression(this.runtimeStyle['zoom'] = '1',this.innerHTML = '')}.icon-thumbs-up{*zoom:expression(this.runtimeStyle['zoom'] = '1',this.innerHTML = '')}.icon-thumbs-down{*zoom:expression(this.runtimeStyle['zoom'] = '1',this.innerHTML = '')}.icon-star-half{*zoom:expression(this.runtimeStyle['zoom'] = '1',this.innerHTML = '')}.icon-heart-empty{*zoom:expression(this.runtimeStyle['zoom'] = '1',this.innerHTML = '')}.icon-signout{*zoom:expression(this.runtimeStyle['zoom'] = '1',this.innerHTML = '')}.icon-linkedin-sign{*zoom:expression(this.runtimeStyle['zoom'] = '1',this.innerHTML = '')}.icon-pushpin{*zoom:expression(this.runtimeStyle['zoom'] = '1',this.innerHTML = '')}.icon-external-link{*zoom:expression(this.runtimeStyle['zoom'] = '1',this.innerHTML = '')}.icon-signin{*zoom:expression(this.runtimeStyle['zoom'] = '1',this.innerHTML = '')}.icon-trophy{*zoom:expression(this.runtimeStyle['zoom'] = '1',this.innerHTML = '')}.icon-github-sign{*zoom:expression(this.runtimeStyle['zoom'] = '1',this.innerHTML = '')}.icon-upload-alt{*zoom:expression(this.runtimeStyle['zoom'] = '1',this.innerHTML = '')}.icon-lemon{*zoom:expression(this.runtimeStyle['zoom'] = '1',this.innerHTML = '')}.icon-phone{*zoom:expression(this.runtimeStyle['zoom'] = '1',this.innerHTML = '')}.icon-check-empty{*zoom:expression(this.runtimeStyle['zoom'] = '1',this.innerHTML = '')}.icon-bookmark-empty{*zoom:expression(this.runtimeStyle['zoom'] = '1',this.innerHTML = '')}.icon-phone-sign{*zoom:expression(this.runtimeStyle['zoom'] = '1',this.innerHTML = '')}.icon-twitter{*zoom:expression(this.runtimeStyle['zoom'] = '1',this.innerHTML = '')}.icon-facebook{*zoom:expression(this.runtimeStyle['zoom'] = '1',this.innerHTML = '')}.icon-github{*zoom:expression(this.runtimeStyle['zoom'] = '1',this.innerHTML = '')}.icon-unlock{*zoom:expression(this.runtimeStyle['zoom'] = '1',this.innerHTML = '')}.icon-credit-card{*zoom:expression(this.runtimeStyle['zoom'] = '1',this.innerHTML = '')}.icon-rss{*zoom:expression(this.runtimeStyle['zoom'] = '1',this.innerHTML = '')}.icon-hdd{*zoom:expression(this.runtimeStyle['zoom'] = '1',this.innerHTML = '')}.icon-bullhorn{*zoom:expression(this.runtimeStyle['zoom'] = '1',this.innerHTML = '')}.icon-bell{*zoom:expression(this.runtimeStyle['zoom'] = '1',this.innerHTML = '')}.icon-certificate{*zoom:expression(this.runtimeStyle['zoom'] = '1',this.innerHTML = '')}.icon-hand-right{*zoom:expression(this.runtimeStyle['zoom'] = '1',this.innerHTML = '')}.icon-hand-left{*zoom:expression(this.runtimeStyle['zoom'] = '1',this.innerHTML = '')}.icon-hand-up{*zoom:expression(this.runtimeStyle['zoom'] = '1',this.innerHTML = '')}.icon-hand-down{*zoom:expression(this.runtimeStyle['zoom'] = '1',this.innerHTML = '')}.icon-circle-arrow-left{*zoom:expression(this.runtimeStyle['zoom'] = '1',this.innerHTML = '')}.icon-circle-arrow-right{*zoom:expression(this.runtimeStyle['zoom'] = '1',this.innerHTML = '')}.icon-circle-arrow-up{*zoom:expression(this.runtimeStyle['zoom'] = '1',this.innerHTML = '')}.icon-circle-arrow-down{*zoom:expression(this.runtimeStyle['zoom'] = '1',this.innerHTML = '')}.icon-globe{*zoom:expression(this.runtimeStyle['zoom'] = '1',this.innerHTML = '')}.icon-wrench{*zoom:expression(this.runtimeStyle['zoom'] = '1',this.innerHTML = '')}.icon-tasks{*zoom:expression(this.runtimeStyle['zoom'] = '1',this.innerHTML = '')}.icon-filter{*zoom:expression(this.runtimeStyle['zoom'] = '1',this.innerHTML = '')}.icon-briefcase{*zoom:expression(this.runtimeStyle['zoom'] = '1',this.innerHTML = '')}.icon-fullscreen{*zoom:expression(this.runtimeStyle['zoom'] = '1',this.innerHTML = '')}.icon-group{*zoom:expression(this.runtimeStyle['zoom'] = '1',this.innerHTML = '')}.icon-link{*zoom:expression(this.runtimeStyle['zoom'] = '1',this.innerHTML = '')}.icon-cloud{*zoom:expression(this.runtimeStyle['zoom'] = '1',this.innerHTML = '')}.icon-beaker{*zoom:expression(this.runtimeStyle['zoom'] = '1',this.innerHTML = '')}.icon-cut{*zoom:expression(this.runtimeStyle['zoom'] = '1',this.innerHTML = '')}.icon-copy{*zoom:expression(this.runtimeStyle['zoom'] = '1',this.innerHTML = '')}.icon-paper-clip{*zoom:expression(this.runtimeStyle['zoom'] = '1',this.innerHTML = '')}.icon-save{*zoom:expression(this.runtimeStyle['zoom'] = '1',this.innerHTML = '')}.icon-sign-blank{*zoom:expression(this.runtimeStyle['zoom'] = '1',this.innerHTML = '')}.icon-reorder{*zoom:expression(this.runtimeStyle['zoom'] = '1',this.innerHTML = '')}.icon-list-ul{*zoom:expression(this.runtimeStyle['zoom'] = '1',this.innerHTML = '')}.icon-list-ol{*zoom:expression(this.runtimeStyle['zoom'] = '1',this.innerHTML = '')}.icon-strikethrough{*zoom:expression(this.runtimeStyle['zoom'] = '1',this.innerHTML = '')}.icon-underline{*zoom:expression(this.runtimeStyle['zoom'] = '1',this.innerHTML = '')}.icon-table{*zoom:expression(this.runtimeStyle['zoom'] = '1',this.innerHTML = '')}.icon-magic{*zoom:expression(this.runtimeStyle['zoom'] = '1',this.innerHTML = '')}.icon-truck{*zoom:expression(this.runtimeStyle['zoom'] = '1',this.innerHTML = '')}.icon-pinterest{*zoom:expression(this.runtimeStyle['zoom'] = '1',this.innerHTML = '')}.icon-pinterest-sign{*zoom:expression(this.runtimeStyle['zoom'] = '1',this.innerHTML = '')}.icon-google-plus-sign{*zoom:expression(this.runtimeStyle['zoom'] = '1',this.innerHTML = '')}.icon-google-plus{*zoom:expression(this.runtimeStyle['zoom'] = '1',this.innerHTML = '')}.icon-money{*zoom:expression(this.runtimeStyle['zoom'] = '1',this.innerHTML = '')}.icon-caret-down{*zoom:expression(this.runtimeStyle['zoom'] = '1',this.innerHTML = '')}.icon-caret-up{*zoom:expression(this.runtimeStyle['zoom'] = '1',this.innerHTML = '')}.icon-caret-left{*zoom:expression(this.runtimeStyle['zoom'] = '1',this.innerHTML = '')}.icon-caret-right{*zoom:expression(this.runtimeStyle['zoom'] = '1',this.innerHTML = '')}.icon-columns{*zoom:expression(this.runtimeStyle['zoom'] = '1',this.innerHTML = '')}.icon-sort{*zoom:expression(this.runtimeStyle['zoom'] = '1',this.innerHTML = '')}.icon-sort-down{*zoom:expression(this.runtimeStyle['zoom'] = '1',this.innerHTML = '')}.icon-sort-up{*zoom:expression(this.runtimeStyle['zoom'] = '1',this.innerHTML = '')}.icon-envelope-alt{*zoom:expression(this.runtimeStyle['zoom'] = '1',this.innerHTML = '')}.icon-linkedin{*zoom:expression(this.runtimeStyle['zoom'] = '1',this.innerHTML = '')}.icon-undo{*zoom:expression(this.runtimeStyle['zoom'] = '1',this.innerHTML = '')}.icon-legal{*zoom:expression(this.runtimeStyle['zoom'] = '1',this.innerHTML = '')}.icon-dashboard{*zoom:expression(this.runtimeStyle['zoom'] = '1',this.innerHTML = '')}.icon-comment-alt{*zoom:expression(this.runtimeStyle['zoom'] = '1',this.innerHTML = '')}.icon-comments-alt{*zoom:expression(this.runtimeStyle['zoom'] = '1',this.innerHTML = '')}.icon-bolt{*zoom:expression(this.runtimeStyle['zoom'] = '1',this.innerHTML = '')}.icon-sitemap{*zoom:expression(this.runtimeStyle['zoom'] = '1',this.innerHTML = '')}.icon-umbrella{*zoom:expression(this.runtimeStyle['zoom'] = '1',this.innerHTML = '')}.icon-paste{*zoom:expression(this.runtimeStyle['zoom'] = '1',this.innerHTML = '')}.icon-lightbulb{*zoom:expression(this.runtimeStyle['zoom'] = '1',this.innerHTML = '')}.icon-exchange{*zoom:expression(this.runtimeStyle['zoom'] = '1',this.innerHTML = '')}.icon-cloud-download{*zoom:expression(this.runtimeStyle['zoom'] = '1',this.innerHTML = '')}.icon-cloud-upload{*zoom:expression(this.runtimeStyle['zoom'] = '1',this.innerHTML = '')}.icon-user-md{*zoom:expression(this.runtimeStyle['zoom'] = '1',this.innerHTML = '')}.icon-stethoscope{*zoom:expression(this.runtimeStyle['zoom'] = '1',this.innerHTML = '')}.icon-suitcase{*zoom:expression(this.runtimeStyle['zoom'] = '1',this.innerHTML = '')}.icon-bell-alt{*zoom:expression(this.runtimeStyle['zoom'] = '1',this.innerHTML = '')}.icon-coffee{*zoom:expression(this.runtimeStyle['zoom'] = '1',this.innerHTML = '')}.icon-food{*zoom:expression(this.runtimeStyle['zoom'] = '1',this.innerHTML = '')}.icon-file-alt{*zoom:expression(this.runtimeStyle['zoom'] = '1',this.innerHTML = '')}.icon-building{*zoom:expression(this.runtimeStyle['zoom'] = '1',this.innerHTML = '')}.icon-hospital{*zoom:expression(this.runtimeStyle['zoom'] = '1',this.innerHTML = '')}.icon-ambulance{*zoom:expression(this.runtimeStyle['zoom'] = '1',this.innerHTML = '')}.icon-medkit{*zoom:expression(this.runtimeStyle['zoom'] = '1',this.innerHTML = '')}.icon-fighter-jet{*zoom:expression(this.runtimeStyle['zoom'] = '1',this.innerHTML = '')}.icon-beer{*zoom:expression(this.runtimeStyle['zoom'] = '1',this.innerHTML = '')}.icon-h-sign{*zoom:expression(this.runtimeStyle['zoom'] = '1',this.innerHTML = '')}.icon-plus-sign-alt{*zoom:expression(this.runtimeStyle['zoom'] = '1',this.innerHTML = '')}.icon-double-angle-left{*zoom:expression(this.runtimeStyle['zoom'] = '1',this.innerHTML = '')}.icon-double-angle-right{*zoom:expression(this.runtimeStyle['zoom'] = '1',this.innerHTML = '')}.icon-double-angle-up{*zoom:expression(this.runtimeStyle['zoom'] = '1',this.innerHTML = '')}.icon-double-angle-down{*zoom:expression(this.runtimeStyle['zoom'] = '1',this.innerHTML = '')}.icon-angle-left{*zoom:expression(this.runtimeStyle['zoom'] = '1',this.innerHTML = '')}.icon-angle-right{*zoom:expression(this.runtimeStyle['zoom'] = '1',this.innerHTML = '')}.icon-angle-up{*zoom:expression(this.runtimeStyle['zoom'] = '1',this.innerHTML = '')}.icon-angle-down{*zoom:expression(this.runtimeStyle['zoom'] = '1',this.innerHTML = '')}.icon-desktop{*zoom:expression(this.runtimeStyle['zoom'] = '1',this.innerHTML = '')}.icon-laptop{*zoom:expression(this.runtimeStyle['zoom'] = '1',this.innerHTML = '')}.icon-tablet{*zoom:expression(this.runtimeStyle['zoom'] = '1',this.innerHTML = '')}.icon-mobile-phone{*zoom:expression(this.runtimeStyle['zoom'] = '1',this.innerHTML = '')}.icon-circle-blank{*zoom:expression(this.runtimeStyle['zoom'] = '1',this.innerHTML = '')}.icon-quote-left{*zoom:expression(this.runtimeStyle['zoom'] = '1',this.innerHTML = '')}.icon-quote-right{*zoom:expression(this.runtimeStyle['zoom'] = '1',this.innerHTML = '')}.icon-spinner{*zoom:expression(this.runtimeStyle['zoom'] = '1',this.innerHTML = '')}.icon-circle{*zoom:expression(this.runtimeStyle['zoom'] = '1',this.innerHTML = '')}.icon-reply{*zoom:expression(this.runtimeStyle['zoom'] = '1',this.innerHTML = '')}.icon-github-alt{*zoom:expression(this.runtimeStyle['zoom'] = '1',this.innerHTML = '')}.icon-folder-close-alt{*zoom:expression(this.runtimeStyle['zoom'] = '1',this.innerHTML = '')}.icon-folder-open-alt{*zoom:expression(this.runtimeStyle['zoom'] = '1',this.innerHTML = '')}
\ No newline at end of file
+ */.icon-large{font-size:1.3333333333333333em;margin-top:-4px;padding-top:3px;margin-bottom:-4px;padding-bottom:3px;vertical-align:middle}.nav [class^="icon-"],.nav [class*=" icon-"]{vertical-align:inherit;margin-top:-4px;padding-top:3px;margin-bottom:-4px;padding-bottom:3px}.nav [class^="icon-"].icon-large,.nav [class*=" icon-"].icon-large{vertical-align:-25%}.nav-pills [class^="icon-"].icon-large,.nav-tabs [class^="icon-"].icon-large,.nav-pills [class*=" icon-"].icon-large,.nav-tabs [class*=" icon-"].icon-large{line-height:.75em;margin-top:-7px;padding-top:5px;margin-bottom:-5px;padding-bottom:4px}ul.icons-ul{text-indent:-1em;margin-left:2.142857142857143em}ul.icons-ul>li .icon-li{width:1em;margin-right:0}.btn [class^="icon-"].pull-left,.btn [class*=" icon-"].pull-left,.btn [class^="icon-"].pull-right,.btn [class*=" icon-"].pull-right{vertical-align:inherit}.btn [class^="icon-"].icon-large,.btn [class*=" icon-"].icon-large{margin-top:-0.5em}a [class^="icon-"],a [class*=" icon-"]{cursor:pointer}.icon-glass{*zoom:expression(this.runtimeStyle['zoom'] = '1',this.innerHTML = '')}.icon-music{*zoom:expression(this.runtimeStyle['zoom'] = '1',this.innerHTML = '')}.icon-search{*zoom:expression(this.runtimeStyle['zoom'] = '1',this.innerHTML = '')}.icon-envelope{*zoom:expression(this.runtimeStyle['zoom'] = '1',this.innerHTML = '')}.icon-heart{*zoom:expression(this.runtimeStyle['zoom'] = '1',this.innerHTML = '')}.icon-star{*zoom:expression(this.runtimeStyle['zoom'] = '1',this.innerHTML = '')}.icon-star-empty{*zoom:expression(this.runtimeStyle['zoom'] = '1',this.innerHTML = '')}.icon-user{*zoom:expression(this.runtimeStyle['zoom'] = '1',this.innerHTML = '')}.icon-film{*zoom:expression(this.runtimeStyle['zoom'] = '1',this.innerHTML = '')}.icon-th-large{*zoom:expression(this.runtimeStyle['zoom'] = '1',this.innerHTML = '')}.icon-th{*zoom:expression(this.runtimeStyle['zoom'] = '1',this.innerHTML = '')}.icon-th-list{*zoom:expression(this.runtimeStyle['zoom'] = '1',this.innerHTML = '')}.icon-ok{*zoom:expression(this.runtimeStyle['zoom'] = '1',this.innerHTML = '')}.icon-remove{*zoom:expression(this.runtimeStyle['zoom'] = '1',this.innerHTML = '')}.icon-zoom-in{*zoom:expression(this.runtimeStyle['zoom'] = '1',this.innerHTML = '')}.icon-zoom-out{*zoom:expression(this.runtimeStyle['zoom'] = '1',this.innerHTML = '')}.icon-off{*zoom:expression(this.runtimeStyle['zoom'] = '1',this.innerHTML = '')}.icon-signal{*zoom:expression(this.runtimeStyle['zoom'] = '1',this.innerHTML = '')}.icon-cog{*zoom:expression(this.runtimeStyle['zoom'] = '1',this.innerHTML = '')}.icon-trash{*zoom:expression(this.runtimeStyle['zoom'] = '1',this.innerHTML = '')}.icon-home{*zoom:expression(this.runtimeStyle['zoom'] = '1',this.innerHTML = '')}.icon-file{*zoom:expression(this.runtimeStyle['zoom'] = '1',this.innerHTML = '')}.icon-time{*zoom:expression(this.runtimeStyle['zoom'] = '1',this.innerHTML = '')}.icon-road{*zoom:expression(this.runtimeStyle['zoom'] = '1',this.innerHTML = '')}.icon-download-alt{*zoom:expression(this.runtimeStyle['zoom'] = '1',this.innerHTML = '')}.icon-download{*zoom:expression(this.runtimeStyle['zoom'] = '1',this.innerHTML = '')}.icon-upload{*zoom:expression(this.runtimeStyle['zoom'] = '1',this.innerHTML = '')}.icon-inbox{*zoom:expression(this.runtimeStyle['zoom'] = '1',this.innerHTML = '')}.icon-play-circle{*zoom:expression(this.runtimeStyle['zoom'] = '1',this.innerHTML = '')}.icon-repeat{*zoom:expression(this.runtimeStyle['zoom'] = '1',this.innerHTML = '')}.icon-refresh{*zoom:expression(this.runtimeStyle['zoom'] = '1',this.innerHTML = '')}.icon-list-alt{*zoom:expression(this.runtimeStyle['zoom'] = '1',this.innerHTML = '')}.icon-lock{*zoom:expression(this.runtimeStyle['zoom'] = '1',this.innerHTML = '')}.icon-flag{*zoom:expression(this.runtimeStyle['zoom'] = '1',this.innerHTML = '')}.icon-headphones{*zoom:expression(this.runtimeStyle['zoom'] = '1',this.innerHTML = '')}.icon-volume-off{*zoom:expression(this.runtimeStyle['zoom'] = '1',this.innerHTML = '')}.icon-volume-down{*zoom:expression(this.runtimeStyle['zoom'] = '1',this.innerHTML = '')}.icon-volume-up{*zoom:expression(this.runtimeStyle['zoom'] = '1',this.innerHTML = '')}.icon-qrcode{*zoom:expression(this.runtimeStyle['zoom'] = '1',this.innerHTML = '')}.icon-barcode{*zoom:expression(this.runtimeStyle['zoom'] = '1',this.innerHTML = '')}.icon-tag{*zoom:expression(this.runtimeStyle['zoom'] = '1',this.innerHTML = '')}.icon-tags{*zoom:expression(this.runtimeStyle['zoom'] = '1',this.innerHTML = '')}.icon-book{*zoom:expression(this.runtimeStyle['zoom'] = '1',this.innerHTML = '')}.icon-bookmark{*zoom:expression(this.runtimeStyle['zoom'] = '1',this.innerHTML = '')}.icon-print{*zoom:expression(this.runtimeStyle['zoom'] = '1',this.innerHTML = '')}.icon-camera{*zoom:expression(this.runtimeStyle['zoom'] = '1',this.innerHTML = '')}.icon-font{*zoom:expression(this.runtimeStyle['zoom'] = '1',this.innerHTML = '')}.icon-bold{*zoom:expression(this.runtimeStyle['zoom'] = '1',this.innerHTML = '')}.icon-italic{*zoom:expression(this.runtimeStyle['zoom'] = '1',this.innerHTML = '')}.icon-text-height{*zoom:expression(this.runtimeStyle['zoom'] = '1',this.innerHTML = '')}.icon-text-width{*zoom:expression(this.runtimeStyle['zoom'] = '1',this.innerHTML = '')}.icon-align-left{*zoom:expression(this.runtimeStyle['zoom'] = '1',this.innerHTML = '')}.icon-align-center{*zoom:expression(this.runtimeStyle['zoom'] = '1',this.innerHTML = '')}.icon-align-right{*zoom:expression(this.runtimeStyle['zoom'] = '1',this.innerHTML = '')}.icon-align-justify{*zoom:expression(this.runtimeStyle['zoom'] = '1',this.innerHTML = '')}.icon-list{*zoom:expression(this.runtimeStyle['zoom'] = '1',this.innerHTML = '')}.icon-indent-left{*zoom:expression(this.runtimeStyle['zoom'] = '1',this.innerHTML = '')}.icon-indent-right{*zoom:expression(this.runtimeStyle['zoom'] = '1',this.innerHTML = '')}.icon-facetime-video{*zoom:expression(this.runtimeStyle['zoom'] = '1',this.innerHTML = '')}.icon-picture{*zoom:expression(this.runtimeStyle['zoom'] = '1',this.innerHTML = '')}.icon-pencil{*zoom:expression(this.runtimeStyle['zoom'] = '1',this.innerHTML = '')}.icon-map-marker{*zoom:expression(this.runtimeStyle['zoom'] = '1',this.innerHTML = '')}.icon-adjust{*zoom:expression(this.runtimeStyle['zoom'] = '1',this.innerHTML = '')}.icon-tint{*zoom:expression(this.runtimeStyle['zoom'] = '1',this.innerHTML = '')}.icon-edit{*zoom:expression(this.runtimeStyle['zoom'] = '1',this.innerHTML = '')}.icon-share{*zoom:expression(this.runtimeStyle['zoom'] = '1',this.innerHTML = '')}.icon-check{*zoom:expression(this.runtimeStyle['zoom'] = '1',this.innerHTML = '')}.icon-move{*zoom:expression(this.runtimeStyle['zoom'] = '1',this.innerHTML = '')}.icon-step-backward{*zoom:expression(this.runtimeStyle['zoom'] = '1',this.innerHTML = '')}.icon-fast-backward{*zoom:expression(this.runtimeStyle['zoom'] = '1',this.innerHTML = '')}.icon-backward{*zoom:expression(this.runtimeStyle['zoom'] = '1',this.innerHTML = '')}.icon-play{*zoom:expression(this.runtimeStyle['zoom'] = '1',this.innerHTML = '')}.icon-pause{*zoom:expression(this.runtimeStyle['zoom'] = '1',this.innerHTML = '')}.icon-stop{*zoom:expression(this.runtimeStyle['zoom'] = '1',this.innerHTML = '')}.icon-forward{*zoom:expression(this.runtimeStyle['zoom'] = '1',this.innerHTML = '')}.icon-fast-forward{*zoom:expression(this.runtimeStyle['zoom'] = '1',this.innerHTML = '')}.icon-step-forward{*zoom:expression(this.runtimeStyle['zoom'] = '1',this.innerHTML = '')}.icon-eject{*zoom:expression(this.runtimeStyle['zoom'] = '1',this.innerHTML = '')}.icon-chevron-left{*zoom:expression(this.runtimeStyle['zoom'] = '1',this.innerHTML = '')}.icon-chevron-right{*zoom:expression(this.runtimeStyle['zoom'] = '1',this.innerHTML = '')}.icon-plus-sign{*zoom:expression(this.runtimeStyle['zoom'] = '1',this.innerHTML = '')}.icon-minus-sign{*zoom:expression(this.runtimeStyle['zoom'] = '1',this.innerHTML = '')}.icon-remove-sign{*zoom:expression(this.runtimeStyle['zoom'] = '1',this.innerHTML = '')}.icon-ok-sign{*zoom:expression(this.runtimeStyle['zoom'] = '1',this.innerHTML = '')}.icon-question-sign{*zoom:expression(this.runtimeStyle['zoom'] = '1',this.innerHTML = '')}.icon-info-sign{*zoom:expression(this.runtimeStyle['zoom'] = '1',this.innerHTML = '')}.icon-screenshot{*zoom:expression(this.runtimeStyle['zoom'] = '1',this.innerHTML = '')}.icon-remove-circle{*zoom:expression(this.runtimeStyle['zoom'] = '1',this.innerHTML = '')}.icon-ok-circle{*zoom:expression(this.runtimeStyle['zoom'] = '1',this.innerHTML = '')}.icon-ban-circle{*zoom:expression(this.runtimeStyle['zoom'] = '1',this.innerHTML = '')}.icon-arrow-left{*zoom:expression(this.runtimeStyle['zoom'] = '1',this.innerHTML = '')}.icon-arrow-right{*zoom:expression(this.runtimeStyle['zoom'] = '1',this.innerHTML = '')}.icon-arrow-up{*zoom:expression(this.runtimeStyle['zoom'] = '1',this.innerHTML = '')}.icon-arrow-down{*zoom:expression(this.runtimeStyle['zoom'] = '1',this.innerHTML = '')}.icon-share-alt{*zoom:expression(this.runtimeStyle['zoom'] = '1',this.innerHTML = '')}.icon-resize-full{*zoom:expression(this.runtimeStyle['zoom'] = '1',this.innerHTML = '')}.icon-resize-small{*zoom:expression(this.runtimeStyle['zoom'] = '1',this.innerHTML = '')}.icon-plus{*zoom:expression(this.runtimeStyle['zoom'] = '1',this.innerHTML = '')}.icon-minus{*zoom:expression(this.runtimeStyle['zoom'] = '1',this.innerHTML = '')}.icon-asterisk{*zoom:expression(this.runtimeStyle['zoom'] = '1',this.innerHTML = '')}.icon-exclamation-sign{*zoom:expression(this.runtimeStyle['zoom'] = '1',this.innerHTML = '')}.icon-gift{*zoom:expression(this.runtimeStyle['zoom'] = '1',this.innerHTML = '')}.icon-leaf{*zoom:expression(this.runtimeStyle['zoom'] = '1',this.innerHTML = '')}.icon-fire{*zoom:expression(this.runtimeStyle['zoom'] = '1',this.innerHTML = '')}.icon-eye-open{*zoom:expression(this.runtimeStyle['zoom'] = '1',this.innerHTML = '')}.icon-eye-close{*zoom:expression(this.runtimeStyle['zoom'] = '1',this.innerHTML = '')}.icon-warning-sign{*zoom:expression(this.runtimeStyle['zoom'] = '1',this.innerHTML = '')}.icon-plane{*zoom:expression(this.runtimeStyle['zoom'] = '1',this.innerHTML = '')}.icon-calendar{*zoom:expression(this.runtimeStyle['zoom'] = '1',this.innerHTML = '')}.icon-random{*zoom:expression(this.runtimeStyle['zoom'] = '1',this.innerHTML = '')}.icon-comment{*zoom:expression(this.runtimeStyle['zoom'] = '1',this.innerHTML = '')}.icon-magnet{*zoom:expression(this.runtimeStyle['zoom'] = '1',this.innerHTML = '')}.icon-chevron-up{*zoom:expression(this.runtimeStyle['zoom'] = '1',this.innerHTML = '')}.icon-chevron-down{*zoom:expression(this.runtimeStyle['zoom'] = '1',this.innerHTML = '')}.icon-retweet{*zoom:expression(this.runtimeStyle['zoom'] = '1',this.innerHTML = '')}.icon-shopping-cart{*zoom:expression(this.runtimeStyle['zoom'] = '1',this.innerHTML = '')}.icon-folder-close{*zoom:expression(this.runtimeStyle['zoom'] = '1',this.innerHTML = '')}.icon-folder-open{*zoom:expression(this.runtimeStyle['zoom'] = '1',this.innerHTML = '')}.icon-resize-vertical{*zoom:expression(this.runtimeStyle['zoom'] = '1',this.innerHTML = '')}.icon-resize-horizontal{*zoom:expression(this.runtimeStyle['zoom'] = '1',this.innerHTML = '')}.icon-bar-chart{*zoom:expression(this.runtimeStyle['zoom'] = '1',this.innerHTML = '')}.icon-twitter-sign{*zoom:expression(this.runtimeStyle['zoom'] = '1',this.innerHTML = '')}.icon-facebook-sign{*zoom:expression(this.runtimeStyle['zoom'] = '1',this.innerHTML = '')}.icon-camera-retro{*zoom:expression(this.runtimeStyle['zoom'] = '1',this.innerHTML = '')}.icon-key{*zoom:expression(this.runtimeStyle['zoom'] = '1',this.innerHTML = '')}.icon-cogs{*zoom:expression(this.runtimeStyle['zoom'] = '1',this.innerHTML = '')}.icon-comments{*zoom:expression(this.runtimeStyle['zoom'] = '1',this.innerHTML = '')}.icon-thumbs-up{*zoom:expression(this.runtimeStyle['zoom'] = '1',this.innerHTML = '')}.icon-thumbs-down{*zoom:expression(this.runtimeStyle['zoom'] = '1',this.innerHTML = '')}.icon-star-half{*zoom:expression(this.runtimeStyle['zoom'] = '1',this.innerHTML = '')}.icon-heart-empty{*zoom:expression(this.runtimeStyle['zoom'] = '1',this.innerHTML = '')}.icon-signout{*zoom:expression(this.runtimeStyle['zoom'] = '1',this.innerHTML = '')}.icon-linkedin-sign{*zoom:expression(this.runtimeStyle['zoom'] = '1',this.innerHTML = '')}.icon-pushpin{*zoom:expression(this.runtimeStyle['zoom'] = '1',this.innerHTML = '')}.icon-external-link{*zoom:expression(this.runtimeStyle['zoom'] = '1',this.innerHTML = '')}.icon-signin{*zoom:expression(this.runtimeStyle['zoom'] = '1',this.innerHTML = '')}.icon-trophy{*zoom:expression(this.runtimeStyle['zoom'] = '1',this.innerHTML = '')}.icon-github-sign{*zoom:expression(this.runtimeStyle['zoom'] = '1',this.innerHTML = '')}.icon-upload-alt{*zoom:expression(this.runtimeStyle['zoom'] = '1',this.innerHTML = '')}.icon-lemon{*zoom:expression(this.runtimeStyle['zoom'] = '1',this.innerHTML = '')}.icon-phone{*zoom:expression(this.runtimeStyle['zoom'] = '1',this.innerHTML = '')}.icon-check-empty{*zoom:expression(this.runtimeStyle['zoom'] = '1',this.innerHTML = '')}.icon-bookmark-empty{*zoom:expression(this.runtimeStyle['zoom'] = '1',this.innerHTML = '')}.icon-phone-sign{*zoom:expression(this.runtimeStyle['zoom'] = '1',this.innerHTML = '')}.icon-twitter{*zoom:expression(this.runtimeStyle['zoom'] = '1',this.innerHTML = '')}.icon-facebook{*zoom:expression(this.runtimeStyle['zoom'] = '1',this.innerHTML = '')}.icon-github{*zoom:expression(this.runtimeStyle['zoom'] = '1',this.innerHTML = '')}.icon-unlock{*zoom:expression(this.runtimeStyle['zoom'] = '1',this.innerHTML = '')}.icon-credit-card{*zoom:expression(this.runtimeStyle['zoom'] = '1',this.innerHTML = '')}.icon-rss{*zoom:expression(this.runtimeStyle['zoom'] = '1',this.innerHTML = '')}.icon-hdd{*zoom:expression(this.runtimeStyle['zoom'] = '1',this.innerHTML = '')}.icon-bullhorn{*zoom:expression(this.runtimeStyle['zoom'] = '1',this.innerHTML = '')}.icon-bell{*zoom:expression(this.runtimeStyle['zoom'] = '1',this.innerHTML = '')}.icon-certificate{*zoom:expression(this.runtimeStyle['zoom'] = '1',this.innerHTML = '')}.icon-hand-right{*zoom:expression(this.runtimeStyle['zoom'] = '1',this.innerHTML = '')}.icon-hand-left{*zoom:expression(this.runtimeStyle['zoom'] = '1',this.innerHTML = '')}.icon-hand-up{*zoom:expression(this.runtimeStyle['zoom'] = '1',this.innerHTML = '')}.icon-hand-down{*zoom:expression(this.runtimeStyle['zoom'] = '1',this.innerHTML = '')}.icon-circle-arrow-left{*zoom:expression(this.runtimeStyle['zoom'] = '1',this.innerHTML = '')}.icon-circle-arrow-right{*zoom:expression(this.runtimeStyle['zoom'] = '1',this.innerHTML = '')}.icon-circle-arrow-up{*zoom:expression(this.runtimeStyle['zoom'] = '1',this.innerHTML = '')}.icon-circle-arrow-down{*zoom:expression(this.runtimeStyle['zoom'] = '1',this.innerHTML = '')}.icon-globe{*zoom:expression(this.runtimeStyle['zoom'] = '1',this.innerHTML = '')}.icon-wrench{*zoom:expression(this.runtimeStyle['zoom'] = '1',this.innerHTML = '')}.icon-tasks{*zoom:expression(this.runtimeStyle['zoom'] = '1',this.innerHTML = '')}.icon-filter{*zoom:expression(this.runtimeStyle['zoom'] = '1',this.innerHTML = '')}.icon-briefcase{*zoom:expression(this.runtimeStyle['zoom'] = '1',this.innerHTML = '')}.icon-fullscreen{*zoom:expression(this.runtimeStyle['zoom'] = '1',this.innerHTML = '')}.icon-group{*zoom:expression(this.runtimeStyle['zoom'] = '1',this.innerHTML = '')}.icon-link{*zoom:expression(this.runtimeStyle['zoom'] = '1',this.innerHTML = '')}.icon-cloud{*zoom:expression(this.runtimeStyle['zoom'] = '1',this.innerHTML = '')}.icon-beaker{*zoom:expression(this.runtimeStyle['zoom'] = '1',this.innerHTML = '')}.icon-cut{*zoom:expression(this.runtimeStyle['zoom'] = '1',this.innerHTML = '')}.icon-copy{*zoom:expression(this.runtimeStyle['zoom'] = '1',this.innerHTML = '')}.icon-paper-clip{*zoom:expression(this.runtimeStyle['zoom'] = '1',this.innerHTML = '')}.icon-save{*zoom:expression(this.runtimeStyle['zoom'] = '1',this.innerHTML = '')}.icon-sign-blank{*zoom:expression(this.runtimeStyle['zoom'] = '1',this.innerHTML = '')}.icon-reorder{*zoom:expression(this.runtimeStyle['zoom'] = '1',this.innerHTML = '')}.icon-list-ul{*zoom:expression(this.runtimeStyle['zoom'] = '1',this.innerHTML = '')}.icon-list-ol{*zoom:expression(this.runtimeStyle['zoom'] = '1',this.innerHTML = '')}.icon-strikethrough{*zoom:expression(this.runtimeStyle['zoom'] = '1',this.innerHTML = '')}.icon-underline{*zoom:expression(this.runtimeStyle['zoom'] = '1',this.innerHTML = '')}.icon-table{*zoom:expression(this.runtimeStyle['zoom'] = '1',this.innerHTML = '')}.icon-magic{*zoom:expression(this.runtimeStyle['zoom'] = '1',this.innerHTML = '')}.icon-truck{*zoom:expression(this.runtimeStyle['zoom'] = '1',this.innerHTML = '')}.icon-pinterest{*zoom:expression(this.runtimeStyle['zoom'] = '1',this.innerHTML = '')}.icon-pinterest-sign{*zoom:expression(this.runtimeStyle['zoom'] = '1',this.innerHTML = '')}.icon-google-plus-sign{*zoom:expression(this.runtimeStyle['zoom'] = '1',this.innerHTML = '')}.icon-google-plus{*zoom:expression(this.runtimeStyle['zoom'] = '1',this.innerHTML = '')}.icon-money{*zoom:expression(this.runtimeStyle['zoom'] = '1',this.innerHTML = '')}.icon-caret-down{*zoom:expression(this.runtimeStyle['zoom'] = '1',this.innerHTML = '')}.icon-caret-up{*zoom:expression(this.runtimeStyle['zoom'] = '1',this.innerHTML = '')}.icon-caret-left{*zoom:expression(this.runtimeStyle['zoom'] = '1',this.innerHTML = '')}.icon-caret-right{*zoom:expression(this.runtimeStyle['zoom'] = '1',this.innerHTML = '')}.icon-columns{*zoom:expression(this.runtimeStyle['zoom'] = '1',this.innerHTML = '')}.icon-sort{*zoom:expression(this.runtimeStyle['zoom'] = '1',this.innerHTML = '')}.icon-sort-down{*zoom:expression(this.runtimeStyle['zoom'] = '1',this.innerHTML = '')}.icon-sort-up{*zoom:expression(this.runtimeStyle['zoom'] = '1',this.innerHTML = '')}.icon-envelope-alt{*zoom:expression(this.runtimeStyle['zoom'] = '1',this.innerHTML = '')}.icon-linkedin{*zoom:expression(this.runtimeStyle['zoom'] = '1',this.innerHTML = '')}.icon-undo{*zoom:expression(this.runtimeStyle['zoom'] = '1',this.innerHTML = '')}.icon-legal{*zoom:expression(this.runtimeStyle['zoom'] = '1',this.innerHTML = '')}.icon-dashboard{*zoom:expression(this.runtimeStyle['zoom'] = '1',this.innerHTML = '')}.icon-comment-alt{*zoom:expression(this.runtimeStyle['zoom'] = '1',this.innerHTML = '')}.icon-comments-alt{*zoom:expression(this.runtimeStyle['zoom'] = '1',this.innerHTML = '')}.icon-bolt{*zoom:expression(this.runtimeStyle['zoom'] = '1',this.innerHTML = '')}.icon-sitemap{*zoom:expression(this.runtimeStyle['zoom'] = '1',this.innerHTML = '')}.icon-umbrella{*zoom:expression(this.runtimeStyle['zoom'] = '1',this.innerHTML = '')}.icon-paste{*zoom:expression(this.runtimeStyle['zoom'] = '1',this.innerHTML = '')}.icon-lightbulb{*zoom:expression(this.runtimeStyle['zoom'] = '1',this.innerHTML = '')}.icon-exchange{*zoom:expression(this.runtimeStyle['zoom'] = '1',this.innerHTML = '')}.icon-cloud-download{*zoom:expression(this.runtimeStyle['zoom'] = '1',this.innerHTML = '')}.icon-cloud-upload{*zoom:expression(this.runtimeStyle['zoom'] = '1',this.innerHTML = '')}.icon-user-md{*zoom:expression(this.runtimeStyle['zoom'] = '1',this.innerHTML = '')}.icon-stethoscope{*zoom:expression(this.runtimeStyle['zoom'] = '1',this.innerHTML = '')}.icon-suitcase{*zoom:expression(this.runtimeStyle['zoom'] = '1',this.innerHTML = '')}.icon-bell-alt{*zoom:expression(this.runtimeStyle['zoom'] = '1',this.innerHTML = '')}.icon-coffee{*zoom:expression(this.runtimeStyle['zoom'] = '1',this.innerHTML = '')}.icon-food{*zoom:expression(this.runtimeStyle['zoom'] = '1',this.innerHTML = '')}.icon-file-alt{*zoom:expression(this.runtimeStyle['zoom'] = '1',this.innerHTML = '')}.icon-building{*zoom:expression(this.runtimeStyle['zoom'] = '1',this.innerHTML = '')}.icon-hospital{*zoom:expression(this.runtimeStyle['zoom'] = '1',this.innerHTML = '')}.icon-ambulance{*zoom:expression(this.runtimeStyle['zoom'] = '1',this.innerHTML = '')}.icon-medkit{*zoom:expression(this.runtimeStyle['zoom'] = '1',this.innerHTML = '')}.icon-fighter-jet{*zoom:expression(this.runtimeStyle['zoom'] = '1',this.innerHTML = '')}.icon-beer{*zoom:expression(this.runtimeStyle['zoom'] = '1',this.innerHTML = '')}.icon-h-sign{*zoom:expression(this.runtimeStyle['zoom'] = '1',this.innerHTML = '')}.icon-plus-sign-alt{*zoom:expression(this.runtimeStyle['zoom'] = '1',this.innerHTML = '')}.icon-double-angle-left{*zoom:expression(this.runtimeStyle['zoom'] = '1',this.innerHTML = '')}.icon-double-angle-right{*zoom:expression(this.runtimeStyle['zoom'] = '1',this.innerHTML = '')}.icon-double-angle-up{*zoom:expression(this.runtimeStyle['zoom'] = '1',this.innerHTML = '')}.icon-double-angle-down{*zoom:expression(this.runtimeStyle['zoom'] = '1',this.innerHTML = '')}.icon-angle-left{*zoom:expression(this.runtimeStyle['zoom'] = '1',this.innerHTML = '')}.icon-angle-right{*zoom:expression(this.runtimeStyle['zoom'] = '1',this.innerHTML = '')}.icon-angle-up{*zoom:expression(this.runtimeStyle['zoom'] = '1',this.innerHTML = '')}.icon-angle-down{*zoom:expression(this.runtimeStyle['zoom'] = '1',this.innerHTML = '')}.icon-desktop{*zoom:expression(this.runtimeStyle['zoom'] = '1',this.innerHTML = '')}.icon-laptop{*zoom:expression(this.runtimeStyle['zoom'] = '1',this.innerHTML = '')}.icon-tablet{*zoom:expression(this.runtimeStyle['zoom'] = '1',this.innerHTML = '')}.icon-mobile-phone{*zoom:expression(this.runtimeStyle['zoom'] = '1',this.innerHTML = '')}.icon-circle-blank{*zoom:expression(this.runtimeStyle['zoom'] = '1',this.innerHTML = '')}.icon-quote-left{*zoom:expression(this.runtimeStyle['zoom'] = '1',this.innerHTML = '')}.icon-quote-right{*zoom:expression(this.runtimeStyle['zoom'] = '1',this.innerHTML = '')}.icon-spinner{*zoom:expression(this.runtimeStyle['zoom'] = '1',this.innerHTML = '')}.icon-circle{*zoom:expression(this.runtimeStyle['zoom'] = '1',this.innerHTML = '')}.icon-reply{*zoom:expression(this.runtimeStyle['zoom'] = '1',this.innerHTML = '')}.icon-folder-close-alt{*zoom:expression(this.runtimeStyle['zoom'] = '1',this.innerHTML = '')}.icon-folder-open-alt{*zoom:expression(this.runtimeStyle['zoom'] = '1',this.innerHTML = '')}.icon-expand-alt{*zoom:expression(this.runtimeStyle['zoom'] = '1',this.innerHTML = '')}.icon-collapse-alt{*zoom:expression(this.runtimeStyle['zoom'] = '1',this.innerHTML = '')}.icon-smile{*zoom:expression(this.runtimeStyle['zoom'] = '1',this.innerHTML = '')}.icon-frown{*zoom:expression(this.runtimeStyle['zoom'] = '1',this.innerHTML = '')}.icon-meh{*zoom:expression(this.runtimeStyle['zoom'] = '1',this.innerHTML = '')}.icon-gamepad{*zoom:expression(this.runtimeStyle['zoom'] = '1',this.innerHTML = '')}.icon-keyboard{*zoom:expression(this.runtimeStyle['zoom'] = '1',this.innerHTML = '')}.icon-flag-alt{*zoom:expression(this.runtimeStyle['zoom'] = '1',this.innerHTML = '')}.icon-flag-checkered{*zoom:expression(this.runtimeStyle['zoom'] = '1',this.innerHTML = '')}.icon-terminal{*zoom:expression(this.runtimeStyle['zoom'] = '1',this.innerHTML = '')}.icon-code{*zoom:expression(this.runtimeStyle['zoom'] = '1',this.innerHTML = '')}.icon-reply-all{*zoom:expression(this.runtimeStyle['zoom'] = '1',this.innerHTML = '')}.icon-mail-reply-all{*zoom:expression(this.runtimeStyle['zoom'] = '1',this.innerHTML = '')}.icon-star-half-full,.icon-star-half-empty{*zoom:expression(this.runtimeStyle['zoom'] = '1',this.innerHTML = '')}.icon-location-arrow{*zoom:expression(this.runtimeStyle['zoom'] = '1',this.innerHTML = '')}.icon-crop{*zoom:expression(this.runtimeStyle['zoom'] = '1',this.innerHTML = '')}.icon-code-fork{*zoom:expression(this.runtimeStyle['zoom'] = '1',this.innerHTML = '')}.icon-unlink{*zoom:expression(this.runtimeStyle['zoom'] = '1',this.innerHTML = '')}.icon-question{*zoom:expression(this.runtimeStyle['zoom'] = '1',this.innerHTML = '')}.icon-info{*zoom:expression(this.runtimeStyle['zoom'] = '1',this.innerHTML = '')}.icon-exclamation{*zoom:expression(this.runtimeStyle['zoom'] = '1',this.innerHTML = '')}.icon-superscript{*zoom:expression(this.runtimeStyle['zoom'] = '1',this.innerHTML = '')}.icon-subscript{*zoom:expression(this.runtimeStyle['zoom'] = '1',this.innerHTML = '')}.icon-eraser{*zoom:expression(this.runtimeStyle['zoom'] = '1',this.innerHTML = '')}.icon-puzzle-piece{*zoom:expression(this.runtimeStyle['zoom'] = '1',this.innerHTML = '')}.icon-microphone{*zoom:expression(this.runtimeStyle['zoom'] = '1',this.innerHTML = '')}.icon-microphone-off{*zoom:expression(this.runtimeStyle['zoom'] = '1',this.innerHTML = '')}.icon-shield{*zoom:expression(this.runtimeStyle['zoom'] = '1',this.innerHTML = '')}.icon-calendar-empty{*zoom:expression(this.runtimeStyle['zoom'] = '1',this.innerHTML = '')}.icon-fire-extinguisher{*zoom:expression(this.runtimeStyle['zoom'] = '1',this.innerHTML = '')}.icon-rocket{*zoom:expression(this.runtimeStyle['zoom'] = '1',this.innerHTML = '')}.icon-maxcdn{*zoom:expression(this.runtimeStyle['zoom'] = '1',this.innerHTML = '')}.icon-chevron-sign-left{*zoom:expression(this.runtimeStyle['zoom'] = '1',this.innerHTML = '')}.icon-chevron-sign-right{*zoom:expression(this.runtimeStyle['zoom'] = '1',this.innerHTML = '')}.icon-chevron-sign-up{*zoom:expression(this.runtimeStyle['zoom'] = '1',this.innerHTML = '')}.icon-chevron-sign-down{*zoom:expression(this.runtimeStyle['zoom'] = '1',this.innerHTML = '')}.icon-html5{*zoom:expression(this.runtimeStyle['zoom'] = '1',this.innerHTML = '')}.icon-css3{*zoom:expression(this.runtimeStyle['zoom'] = '1',this.innerHTML = '')}.icon-anchor{*zoom:expression(this.runtimeStyle['zoom'] = '1',this.innerHTML = '')}.icon-unlock-alt{*zoom:expression(this.runtimeStyle['zoom'] = '1',this.innerHTML = '')}.icon-bullseye{*zoom:expression(this.runtimeStyle['zoom'] = '1',this.innerHTML = '')}.icon-ellipsis-horizontal{*zoom:expression(this.runtimeStyle['zoom'] = '1',this.innerHTML = '')}.icon-ellipsis-vertical{*zoom:expression(this.runtimeStyle['zoom'] = '1',this.innerHTML = '')}.icon-rss-sign{*zoom:expression(this.runtimeStyle['zoom'] = '1',this.innerHTML = '')}.icon-play-sign{*zoom:expression(this.runtimeStyle['zoom'] = '1',this.innerHTML = '')}.icon-ticket{*zoom:expression(this.runtimeStyle['zoom'] = '1',this.innerHTML = '')}.icon-minus-sign-alt{*zoom:expression(this.runtimeStyle['zoom'] = '1',this.innerHTML = '')}.icon-check-minus{*zoom:expression(this.runtimeStyle['zoom'] = '1',this.innerHTML = '')}.icon-level-up{*zoom:expression(this.runtimeStyle['zoom'] = '1',this.innerHTML = '')}.icon-level-down{*zoom:expression(this.runtimeStyle['zoom'] = '1',this.innerHTML = '')}.icon-check-sign{*zoom:expression(this.runtimeStyle['zoom'] = '1',this.innerHTML = '')}.icon-edit-sign{*zoom:expression(this.runtimeStyle['zoom'] = '1',this.innerHTML = '')}.icon-external-link-sign{*zoom:expression(this.runtimeStyle['zoom'] = '1',this.innerHTML = '')}.icon-share-sign{*zoom:expression(this.runtimeStyle['zoom'] = '1',this.innerHTML = '')}
\ No newline at end of file
diff --git a/htdocs/js/lib/bootstrap/css/font-awesome.min.css b/htdocs/js/lib/bootstrap/css/font-awesome.min.css
index d4e45b3c..389f3b7e 100644
--- a/htdocs/js/lib/bootstrap/css/font-awesome.min.css
+++ b/htdocs/js/lib/bootstrap/css/font-awesome.min.css
@@ -1,33 +1,24 @@
/*!
- * Font Awesome 3.0.2
- * the iconic font designed for use with Twitter Bootstrap
+ * Font Awesome 3.1.0
+ * the iconic font designed for Bootstrap
* -------------------------------------------------------
* The full suite of pictographic icons, examples, and documentation
- * can be found at: http://fortawesome.github.com/Font-Awesome/
+ * can be found at: http://fontawesome.io
*
* License
* -------------------------------------------------------
- * - The Font Awesome font is licensed under the SIL Open Font License - http://scripts.sil.org/OFL
+ * - The Font Awesome font is licensed under the SIL Open Font License v1.1 -
+ * http://scripts.sil.org/OFL
* - Font Awesome CSS, LESS, and SASS files are licensed under the MIT License -
* http://opensource.org/licenses/mit-license.html
- * - The Font Awesome pictograms are licensed under the CC BY 3.0 License - http://creativecommons.org/licenses/by/3.0/
+ * - Font Awesome documentation licensed under CC BY 3.0 License -
+ * http://creativecommons.org/licenses/by/3.0/
* - Attribution is no longer required in Font Awesome 3.0, but much appreciated:
- * "Font Awesome by Dave Gandy - http://fortawesome.github.com/Font-Awesome"
+ * "Font Awesome by Dave Gandy - http://fontawesome.io"
* Contact
* -------------------------------------------------------
- * Email: dave@davegandy.com
+ * Email: dave@fontawesome.io
* Twitter: http://twitter.com/fortaweso_me
* Work: Lead Product Designer @ http://kyruus.com
- */
-
-@font-face{
- font-family:'FontAwesome';
- src:url('../font/fontawesome-webfont.eot?v=3.0.1');
- src:url('../font/fontawesome-webfont.eot?#iefix&v=3.0.1') format('embedded-opentype'),
- url('../font/fontawesome-webfont.woff?v=3.0.1') format('woff'),
- url('../font/fontawesome-webfont.ttf?v=3.0.1') format('truetype');
- font-weight:normal;
- font-style:normal }
-
-[class^="icon-"],[class*=" icon-"]{font-family:FontAwesome;font-weight:normal;font-style:normal;text-decoration:inherit;-webkit-font-smoothing:antialiased;display:inline;width:auto;height:auto;line-height:normal;vertical-align:baseline;background-image:none;background-position:0 0;background-repeat:repeat;margin-top:0}.icon-white,.nav-pills>.active>a>[class^="icon-"],.nav-pills>.active>a>[class*=" icon-"],.nav-list>.active>a>[class^="icon-"],.nav-list>.active>a>[class*=" icon-"],.navbar-inverse .nav>.active>a>[class^="icon-"],.navbar-inverse .nav>.active>a>[class*=" icon-"],.dropdown-menu>li>a:hover>[class^="icon-"],.dropdown-menu>li>a:hover>[class*=" icon-"],.dropdown-menu>.active>a>[class^="icon-"],.dropdown-menu>.active>a>[class*=" icon-"],.dropdown-submenu:hover>a>[class^="icon-"],.dropdown-submenu:hover>a>[class*=" icon-"]{background-image:none}[class^="icon-"]:before,[class*=" icon-"]:before{text-decoration:inherit;display:inline-block;speak:none}a [class^="icon-"],a [class*=" icon-"]{display:inline-block}.icon-large:before{vertical-align:-10%;font-size:1.3333333333333333em}.btn [class^="icon-"],.nav [class^="icon-"],.btn [class*=" icon-"],.nav [class*=" icon-"]{display:inline}.btn [class^="icon-"].icon-large,.nav [class^="icon-"].icon-large,.btn [class*=" icon-"].icon-large,.nav [class*=" icon-"].icon-large{line-height:.9em}.btn [class^="icon-"].icon-spin,.nav [class^="icon-"].icon-spin,.btn [class*=" icon-"].icon-spin,.nav [class*=" icon-"].icon-spin{display:inline-block}.nav-tabs [class^="icon-"],.nav-pills [class^="icon-"],.nav-tabs [class*=" icon-"],.nav-pills [class*=" icon-"],.nav-tabs [class^="icon-"].icon-large,.nav-pills [class^="icon-"].icon-large,.nav-tabs [class*=" icon-"].icon-large,.nav-pills [class*=" icon-"].icon-large{line-height:.9em}li [class^="icon-"],.nav li [class^="icon-"],li [class*=" icon-"],.nav li [class*=" icon-"]{display:inline-block;width:1.25em;text-align:center}li [class^="icon-"].icon-large,.nav li [class^="icon-"].icon-large,li [class*=" icon-"].icon-large,.nav li [class*=" icon-"].icon-large{width:1.5625em}ul.icons{list-style-type:none;text-indent:-0.75em}ul.icons li [class^="icon-"],ul.icons li [class*=" icon-"]{width:.75em}.icon-muted{color:#eee}.icon-border{border:solid 1px #eee;padding:.2em .25em .15em;-webkit-border-radius:3px;-moz-border-radius:3px;border-radius:3px}.icon-2x{font-size:2em}.icon-2x.icon-border{border-width:2px;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px}.icon-3x{font-size:3em}.icon-3x.icon-border{border-width:3px;-webkit-border-radius:5px;-moz-border-radius:5px;border-radius:5px}.icon-4x{font-size:4em}.icon-4x.icon-border{border-width:4px;-webkit-border-radius:6px;-moz-border-radius:6px;border-radius:6px}.pull-right{float:right}.pull-left{float:left}[class^="icon-"].pull-left,[class*=" icon-"].pull-left{margin-right:.3em}[class^="icon-"].pull-right,[class*=" icon-"].pull-right{margin-left:.3em}.btn [class^="icon-"].pull-left.icon-2x,.btn [class*=" icon-"].pull-left.icon-2x,.btn [class^="icon-"].pull-right.icon-2x,.btn [class*=" icon-"].pull-right.icon-2x{margin-top:.18em}.btn [class^="icon-"].icon-spin.icon-large,.btn [class*=" icon-"].icon-spin.icon-large{line-height:.8em}.btn.btn-small [class^="icon-"].pull-left.icon-2x,.btn.btn-small [class*=" icon-"].pull-left.icon-2x,.btn.btn-small [class^="icon-"].pull-right.icon-2x,.btn.btn-small [class*=" icon-"].pull-right.icon-2x{margin-top:.25em}.btn.btn-large [class^="icon-"],.btn.btn-large [class*=" icon-"]{margin-top:0}.btn.btn-large [class^="icon-"].pull-left.icon-2x,.btn.btn-large [class*=" icon-"].pull-left.icon-2x,.btn.btn-large [class^="icon-"].pull-right.icon-2x,.btn.btn-large [class*=" icon-"].pull-right.icon-2x{margin-top:.05em}.btn.btn-large [class^="icon-"].pull-left.icon-2x,.btn.btn-large [class*=" icon-"].pull-left.icon-2x{margin-right:.2em}.btn.btn-large [class^="icon-"].pull-right.icon-2x,.btn.btn-large [class*=" icon-"].pull-right.icon-2x{margin-left:.2em}.icon-spin{display:inline-block;-moz-animation:spin 2s infinite linear;-o-animation:spin 2s infinite linear;-webkit-animation:spin 2s infinite linear;animation:spin 2s infinite linear}@-moz-keyframes spin{0%{-moz-transform:rotate(0deg)}100%{-moz-transform:rotate(359deg)}}@-webkit-keyframes spin{0%{-webkit-transform:rotate(0deg)}100%{-webkit-transform:rotate(359deg)}}@-o-keyframes spin{0%{-o-transform:rotate(0deg)}100%{-o-transform:rotate(359deg)}}@-ms-keyframes spin{0%{-ms-transform:rotate(0deg)}100%{-ms-transform:rotate(359deg)}}@keyframes spin{0%{transform:rotate(0deg)}100%{transform:rotate(359deg)}}@-moz-document url-prefix(){.icon-spin{height:.9em}.btn .icon-spin{height:auto}.icon-spin.icon-large{height:1.25em}.btn .icon-spin.icon-large{height:.75em}}.icon-glass:before{content:"\f000"}.icon-music:before{content:"\f001"}.icon-search:before{content:"\f002"}.icon-envelope:before{content:"\f003"}.icon-heart:before{content:"\f004"}.icon-star:before{content:"\f005"}.icon-star-empty:before{content:"\f006"}.icon-user:before{content:"\f007"}.icon-film:before{content:"\f008"}.icon-th-large:before{content:"\f009"}.icon-th:before{content:"\f00a"}.icon-th-list:before{content:"\f00b"}.icon-ok:before{content:"\f00c"}.icon-remove:before{content:"\f00d"}.icon-zoom-in:before{content:"\f00e"}.icon-zoom-out:before{content:"\f010"}.icon-off:before{content:"\f011"}.icon-signal:before{content:"\f012"}.icon-cog:before{content:"\f013"}.icon-trash:before{content:"\f014"}.icon-home:before{content:"\f015"}.icon-file:before{content:"\f016"}.icon-time:before{content:"\f017"}.icon-road:before{content:"\f018"}.icon-download-alt:before{content:"\f019"}.icon-download:before{content:"\f01a"}.icon-upload:before{content:"\f01b"}.icon-inbox:before{content:"\f01c"}.icon-play-circle:before{content:"\f01d"}.icon-repeat:before{content:"\f01e"}.icon-refresh:before{content:"\f021"}.icon-list-alt:before{content:"\f022"}.icon-lock:before{content:"\f023"}.icon-flag:before{content:"\f024"}.icon-headphones:before{content:"\f025"}.icon-volume-off:before{content:"\f026"}.icon-volume-down:before{content:"\f027"}.icon-volume-up:before{content:"\f028"}.icon-qrcode:before{content:"\f029"}.icon-barcode:before{content:"\f02a"}.icon-tag:before{content:"\f02b"}.icon-tags:before{content:"\f02c"}.icon-book:before{content:"\f02d"}.icon-bookmark:before{content:"\f02e"}.icon-print:before{content:"\f02f"}.icon-camera:before{content:"\f030"}.icon-font:before{content:"\f031"}.icon-bold:before{content:"\f032"}.icon-italic:before{content:"\f033"}.icon-text-height:before{content:"\f034"}.icon-text-width:before{content:"\f035"}.icon-align-left:before{content:"\f036"}.icon-align-center:before{content:"\f037"}.icon-align-right:before{content:"\f038"}.icon-align-justify:before{content:"\f039"}.icon-list:before{content:"\f03a"}.icon-indent-left:before{content:"\f03b"}.icon-indent-right:before{content:"\f03c"}.icon-facetime-video:before{content:"\f03d"}.icon-picture:before{content:"\f03e"}.icon-pencil:before{content:"\f040"}.icon-map-marker:before{content:"\f041"}.icon-adjust:before{content:"\f042"}.icon-tint:before{content:"\f043"}.icon-edit:before{content:"\f044"}.icon-share:before{content:"\f045"}.icon-check:before{content:"\f046"}.icon-move:before{content:"\f047"}.icon-step-backward:before{content:"\f048"}.icon-fast-backward:before{content:"\f049"}.icon-backward:before{content:"\f04a"}.icon-play:before{content:"\f04b"}.icon-pause:before{content:"\f04c"}.icon-stop:before{content:"\f04d"}.icon-forward:before{content:"\f04e"}.icon-fast-forward:before{content:"\f050"}.icon-step-forward:before{content:"\f051"}.icon-eject:before{content:"\f052"}.icon-chevron-left:before{content:"\f053"}.icon-chevron-right:before{content:"\f054"}.icon-plus-sign:before{content:"\f055"}.icon-minus-sign:before{content:"\f056"}.icon-remove-sign:before{content:"\f057"}.icon-ok-sign:before{content:"\f058"}.icon-question-sign:before{content:"\f059"}.icon-info-sign:before{content:"\f05a"}.icon-screenshot:before{content:"\f05b"}.icon-remove-circle:before{content:"\f05c"}.icon-ok-circle:before{content:"\f05d"}.icon-ban-circle:before{content:"\f05e"}.icon-arrow-left:before{content:"\f060"}.icon-arrow-right:before{content:"\f061"}.icon-arrow-up:before{content:"\f062"}.icon-arrow-down:before{content:"\f063"}.icon-share-alt:before{content:"\f064"}.icon-resize-full:before{content:"\f065"}.icon-resize-small:before{content:"\f066"}.icon-plus:before{content:"\f067"}.icon-minus:before{content:"\f068"}.icon-asterisk:before{content:"\f069"}.icon-exclamation-sign:before{content:"\f06a"}.icon-gift:before{content:"\f06b"}.icon-leaf:before{content:"\f06c"}.icon-fire:before{content:"\f06d"}.icon-eye-open:before{content:"\f06e"}.icon-eye-close:before{content:"\f070"}.icon-warning-sign:before{content:"\f071"}.icon-plane:before{content:"\f072"}.icon-calendar:before{content:"\f073"}.icon-random:before{content:"\f074"}.icon-comment:before{content:"\f075"}.icon-magnet:before{content:"\f076"}.icon-chevron-up:before{content:"\f077"}.icon-chevron-down:before{content:"\f078"}.icon-retweet:before{content:"\f079"}.icon-shopping-cart:before{content:"\f07a"}.icon-folder-close:before{content:"\f07b"}.icon-folder-open:before{content:"\f07c"}.icon-resize-vertical:before{content:"\f07d"}.icon-resize-horizontal:before{content:"\f07e"}.icon-bar-chart:before{content:"\f080"}.icon-twitter-sign:before{content:"\f081"}.icon-facebook-sign:before{content:"\f082"}.icon-camera-retro:before{content:"\f083"}.icon-key:before{content:"\f084"}.icon-cogs:before{content:"\f085"}.icon-comments:before{content:"\f086"}.icon-thumbs-up:before{content:"\f087"}.icon-thumbs-down:before{content:"\f088"}.icon-star-half:before{content:"\f089"}.icon-heart-empty:before{content:"\f08a"}.icon-signout:before{content:"\f08b"}.icon-linkedin-sign:before{content:"\f08c"}.icon-pushpin:before{content:"\f08d"}.icon-external-link:before{content:"\f08e"}.icon-signin:before{content:"\f090"}.icon-trophy:before{content:"\f091"}.icon-github-sign:before{content:"\f092"}.icon-upload-alt:before{content:"\f093"}.icon-lemon:before{content:"\f094"}.icon-phone:before{content:"\f095"}.icon-check-empty:before{content:"\f096"}.icon-bookmark-empty:before{content:"\f097"}.icon-phone-sign:before{content:"\f098"}.icon-twitter:before{content:"\f099"}.icon-facebook:before{content:"\f09a"}.icon-github:before{content:"\f09b"}.icon-unlock:before{content:"\f09c"}.icon-credit-card:before{content:"\f09d"}.icon-rss:before{content:"\f09e"}.icon-hdd:before{content:"\f0a0"}.icon-bullhorn:before{content:"\f0a1"}.icon-bell:before{content:"\f0a2"}.icon-certificate:before{content:"\f0a3"}.icon-hand-right:before{content:"\f0a4"}.icon-hand-left:before{content:"\f0a5"}.icon-hand-up:before{content:"\f0a6"}.icon-hand-down:before{content:"\f0a7"}.icon-circle-arrow-left:before{content:"\f0a8"}.icon-circle-arrow-right:before{content:"\f0a9"}.icon-circle-arrow-up:before{content:"\f0aa"}.icon-circle-arrow-down:before{content:"\f0ab"}.icon-globe:before{content:"\f0ac"}.icon-wrench:before{content:"\f0ad"}.icon-tasks:before{content:"\f0ae"}.icon-filter:before{content:"\f0b0"}.icon-briefcase:before{content:"\f0b1"}.icon-fullscreen:before{content:"\f0b2"}.icon-group:before{content:"\f0c0"}.icon-link:before{content:"\f0c1"}.icon-cloud:before{content:"\f0c2"}.icon-beaker:before{content:"\f0c3"}.icon-cut:before{content:"\f0c4"}.icon-copy:before{content:"\f0c5"}.icon-paper-clip:before{content:"\f0c6"}.icon-save:before{content:"\f0c7"}.icon-sign-blank:before{content:"\f0c8"}.icon-reorder:before{content:"\f0c9"}.icon-list-ul:before{content:"\f0ca"}.icon-list-ol:before{content:"\f0cb"}.icon-strikethrough:before{content:"\f0cc"}.icon-underline:before{content:"\f0cd"}.icon-table:before{content:"\f0ce"}.icon-magic:before{content:"\f0d0"}.icon-truck:before{content:"\f0d1"}.icon-pinterest:before{content:"\f0d2"}.icon-pinterest-sign:before{content:"\f0d3"}.icon-google-plus-sign:before{content:"\f0d4"}.icon-google-plus:before{content:"\f0d5"}.icon-money:before{content:"\f0d6"}.icon-caret-down:before{content:"\f0d7"}.icon-caret-up:before{content:"\f0d8"}.icon-caret-left:before{content:"\f0d9"}.icon-caret-right:before{content:"\f0da"}.icon-columns:before{content:"\f0db"}.icon-sort:before{content:"\f0dc"}.icon-sort-down:before{content:"\f0dd"}.icon-sort-up:before{content:"\f0de"}.icon-envelope-alt:before{content:"\f0e0"}.icon-linkedin:before{content:"\f0e1"}.icon-undo:before{content:"\f0e2"}.icon-legal:before{content:"\f0e3"}.icon-dashboard:before{content:"\f0e4"}.icon-comment-alt:before{content:"\f0e5"}.icon-comments-alt:before{content:"\f0e6"}.icon-bolt:before{content:"\f0e7"}.icon-sitemap:before{content:"\f0e8"}.icon-umbrella:before{content:"\f0e9"}.icon-paste:before{content:"\f0ea"}.icon-lightbulb:before{content:"\f0eb"}.icon-exchange:before{content:"\f0ec"}.icon-cloud-download:before{content:"\f0ed"}.icon-cloud-upload:before{content:"\f0ee"}.icon-user-md:before{content:"\f0f0"}.icon-stethoscope:before{content:"\f0f1"}.icon-suitcase:before{content:"\f0f2"}.icon-bell-alt:before{content:"\f0f3"}.icon-coffee:before{content:"\f0f4"}.icon-food:before{content:"\f0f5"}.icon-file-alt:before{content:"\f0f6"}.icon-building:before{content:"\f0f7"}.icon-hospital:before{content:"\f0f8"}.icon-ambulance:before{content:"\f0f9"}.icon-medkit:before{content:"\f0fa"}.icon-fighter-jet:before{content:"\f0fb"}.icon-beer:before{content:"\f0fc"}.icon-h-sign:before{content:"\f0fd"}.icon-plus-sign-alt:before{content:"\f0fe"}.icon-double-angle-left:before{content:"\f100"}.icon-double-angle-right:before{content:"\f101"}.icon-double-angle-up:before{content:"\f102"}.icon-double-angle-down:before{content:"\f103"}.icon-angle-left:before{content:"\f104"}.icon-angle-right:before{content:"\f105"}.icon-angle-up:before{content:"\f106"}.icon-angle-down:before{content:"\f107"}.icon-desktop:before{content:"\f108"}.icon-laptop:before{content:"\f109"}.icon-tablet:before{content:"\f10a"}.icon-mobile-phone:before{content:"\f10b"}.icon-circle-blank:before{content:"\f10c"}.icon-quote-left:before{content:"\f10d"}.icon-quote-right:before{content:"\f10e"}.icon-spinner:before{content:"\f110"}.icon-circle:before{content:"\f111"}.icon-reply:before{content:"\f112"}.icon-github-alt:before{content:"\f113"}.icon-folder-close-alt:before{content:"\f114"}.icon-folder-open-alt:before{content:"\f115"}
\ No newline at end of file
+ */@font-face{font-family:'FontAwesome';src:url('../font/fontawesome-webfont.eot?v=3.1.0');src:url('../font/fontawesome-webfont.eot?#iefix&v=3.1.0') format('embedded-opentype'),url('../font/fontawesome-webfont.woff?v=3.1.0') format('woff'),url('../font/fontawesome-webfont.ttf?v=3.1.0') format('truetype'),url('../font/fontawesome-webfont.svg#fontawesomeregular?v=3.1.0') format('svg');font-weight:normal;font-style:normal}[class^="icon-"],[class*=" icon-"]{font-family:FontAwesome;font-weight:normal;font-style:normal;text-decoration:inherit;-webkit-font-smoothing:antialiased;*margin-right:.3em}[class^="icon-"]:before,[class*=" icon-"]:before{text-decoration:inherit;display:inline-block;speak:none}.icon-large:before{vertical-align:-10%;font-size:1.3333333333333333em}a [class^="icon-"],a [class*=" icon-"],a [class^="icon-"]:before,a [class*=" icon-"]:before{display:inline}[class^="icon-"].icon-fixed-width,[class*=" icon-"].icon-fixed-width{display:inline-block;width:1.2857142857142858em;text-align:center}[class^="icon-"].icon-fixed-width.icon-large,[class*=" icon-"].icon-fixed-width.icon-large{width:1.5714285714285714em}ul.icons-ul{list-style-type:none;text-indent:-0.7142857142857143em;margin-left:2.142857142857143em}ul.icons-ul>li .icon-li{width:.7142857142857143em;display:inline-block;text-align:center}[class^="icon-"].hide,[class*=" icon-"].hide{display:none}.icon-muted{color:#eee}.icon-light{color:#fff}.icon-dark{color:#333}.icon-border{border:solid 1px #eee;padding:.2em .25em .15em;-webkit-border-radius:3px;-moz-border-radius:3px;border-radius:3px}.icon-2x{font-size:2em}.icon-2x.icon-border{border-width:2px;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px}.icon-3x{font-size:3em}.icon-3x.icon-border{border-width:3px;-webkit-border-radius:5px;-moz-border-radius:5px;border-radius:5px}.icon-4x{font-size:4em}.icon-4x.icon-border{border-width:4px;-webkit-border-radius:6px;-moz-border-radius:6px;border-radius:6px}.icon-5x{font-size:5em}.icon-5x.icon-border{border-width:5px;-webkit-border-radius:7px;-moz-border-radius:7px;border-radius:7px}.pull-right{float:right}.pull-left{float:left}[class^="icon-"].pull-left,[class*=" icon-"].pull-left{margin-right:.3em}[class^="icon-"].pull-right,[class*=" icon-"].pull-right{margin-left:.3em}[class^="icon-"],[class*=" icon-"]{display:inline;width:auto;height:auto;line-height:normal;vertical-align:baseline;background-image:none;background-position:0 0;background-repeat:repeat;margin-top:0}.icon-white,.nav-pills>.active>a>[class^="icon-"],.nav-pills>.active>a>[class*=" icon-"],.nav-list>.active>a>[class^="icon-"],.nav-list>.active>a>[class*=" icon-"],.navbar-inverse .nav>.active>a>[class^="icon-"],.navbar-inverse .nav>.active>a>[class*=" icon-"],.dropdown-menu>li>a:hover>[class^="icon-"],.dropdown-menu>li>a:hover>[class*=" icon-"],.dropdown-menu>.active>a>[class^="icon-"],.dropdown-menu>.active>a>[class*=" icon-"],.dropdown-submenu:hover>a>[class^="icon-"],.dropdown-submenu:hover>a>[class*=" icon-"]{background-image:none}.btn [class^="icon-"].icon-large,.nav [class^="icon-"].icon-large,.btn [class*=" icon-"].icon-large,.nav [class*=" icon-"].icon-large{line-height:.9em}.btn [class^="icon-"].icon-spin,.nav [class^="icon-"].icon-spin,.btn [class*=" icon-"].icon-spin,.nav [class*=" icon-"].icon-spin{display:inline-block}.nav-tabs [class^="icon-"],.nav-pills [class^="icon-"],.nav-tabs [class*=" icon-"],.nav-pills [class*=" icon-"],.nav-tabs [class^="icon-"].icon-large,.nav-pills [class^="icon-"].icon-large,.nav-tabs [class*=" icon-"].icon-large,.nav-pills [class*=" icon-"].icon-large{line-height:.9em}.btn [class^="icon-"].pull-left.icon-2x,.btn [class*=" icon-"].pull-left.icon-2x,.btn [class^="icon-"].pull-right.icon-2x,.btn [class*=" icon-"].pull-right.icon-2x{margin-top:.18em}.btn [class^="icon-"].icon-spin.icon-large,.btn [class*=" icon-"].icon-spin.icon-large{line-height:.8em}.btn.btn-small [class^="icon-"].pull-left.icon-2x,.btn.btn-small [class*=" icon-"].pull-left.icon-2x,.btn.btn-small [class^="icon-"].pull-right.icon-2x,.btn.btn-small [class*=" icon-"].pull-right.icon-2x{margin-top:.25em}.btn.btn-large [class^="icon-"],.btn.btn-large [class*=" icon-"]{margin-top:0}.btn.btn-large [class^="icon-"].pull-left.icon-2x,.btn.btn-large [class*=" icon-"].pull-left.icon-2x,.btn.btn-large [class^="icon-"].pull-right.icon-2x,.btn.btn-large [class*=" icon-"].pull-right.icon-2x{margin-top:.05em}.btn.btn-large [class^="icon-"].pull-left.icon-2x,.btn.btn-large [class*=" icon-"].pull-left.icon-2x{margin-right:.2em}.btn.btn-large [class^="icon-"].pull-right.icon-2x,.btn.btn-large [class*=" icon-"].pull-right.icon-2x{margin-left:.2em}.icon-stack{position:relative;display:inline-block;width:2em;height:2em;line-height:2em;vertical-align:-35%}.icon-stack [class^="icon-"],.icon-stack [class*=" icon-"]{display:block;text-align:center;position:absolute;width:100%;height:100%;font-size:1em;line-height:inherit;*line-height:2em}.icon-stack .icon-stack-base{font-size:2em;*line-height:1em}.icon-spin{display:inline-block;-moz-animation:spin 2s infinite linear;-o-animation:spin 2s infinite linear;-webkit-animation:spin 2s infinite linear;animation:spin 2s infinite linear}@-moz-keyframes spin{0%{-moz-transform:rotate(0deg)}100%{-moz-transform:rotate(359deg)}}@-webkit-keyframes spin{0%{-webkit-transform:rotate(0deg)}100%{-webkit-transform:rotate(359deg)}}@-o-keyframes spin{0%{-o-transform:rotate(0deg)}100%{-o-transform:rotate(359deg)}}@-ms-keyframes spin{0%{-ms-transform:rotate(0deg)}100%{-ms-transform:rotate(359deg)}}@keyframes spin{0%{transform:rotate(0deg)}100%{transform:rotate(359deg)}}.icon-rotate-90:before{-webkit-transform:rotate(90deg);-moz-transform:rotate(90deg);-ms-transform:rotate(90deg);-o-transform:rotate(90deg);transform:rotate(90deg);filter:progid:DXImageTransform.Microsoft.BasicImage(rotation=1)}.icon-rotate-180:before{-webkit-transform:rotate(180deg);-moz-transform:rotate(180deg);-ms-transform:rotate(180deg);-o-transform:rotate(180deg);transform:rotate(180deg);filter:progid:DXImageTransform.Microsoft.BasicImage(rotation=2)}.icon-rotate-270:before{-webkit-transform:rotate(270deg);-moz-transform:rotate(270deg);-ms-transform:rotate(270deg);-o-transform:rotate(270deg);transform:rotate(270deg);filter:progid:DXImageTransform.Microsoft.BasicImage(rotation=3)}.icon-flip-horizontal:before{-webkit-transform:scale(-1,1);-moz-transform:scale(-1,1);-ms-transform:scale(-1,1);-o-transform:scale(-1,1);transform:scale(-1,1)}.icon-flip-vertical:before{-webkit-transform:scale(1,-1);-moz-transform:scale(1,-1);-ms-transform:scale(1,-1);-o-transform:scale(1,-1);transform:scale(1,-1)}.icon-glass:before{content:"\f000"}.icon-music:before{content:"\f001"}.icon-search:before{content:"\f002"}.icon-envelope:before{content:"\f003"}.icon-heart:before{content:"\f004"}.icon-star:before{content:"\f005"}.icon-star-empty:before{content:"\f006"}.icon-user:before{content:"\f007"}.icon-film:before{content:"\f008"}.icon-th-large:before{content:"\f009"}.icon-th:before{content:"\f00a"}.icon-th-list:before{content:"\f00b"}.icon-ok:before{content:"\f00c"}.icon-remove:before{content:"\f00d"}.icon-zoom-in:before{content:"\f00e"}.icon-zoom-out:before{content:"\f010"}.icon-off:before{content:"\f011"}.icon-signal:before{content:"\f012"}.icon-cog:before{content:"\f013"}.icon-trash:before{content:"\f014"}.icon-home:before{content:"\f015"}.icon-file:before{content:"\f016"}.icon-time:before{content:"\f017"}.icon-road:before{content:"\f018"}.icon-download-alt:before{content:"\f019"}.icon-download:before{content:"\f01a"}.icon-upload:before{content:"\f01b"}.icon-inbox:before{content:"\f01c"}.icon-play-circle:before{content:"\f01d"}.icon-repeat:before,.icon-rotate-right:before{content:"\f01e"}.icon-refresh:before{content:"\f021"}.icon-list-alt:before{content:"\f022"}.icon-lock:before{content:"\f023"}.icon-flag:before{content:"\f024"}.icon-headphones:before{content:"\f025"}.icon-volume-off:before{content:"\f026"}.icon-volume-down:before{content:"\f027"}.icon-volume-up:before{content:"\f028"}.icon-qrcode:before{content:"\f029"}.icon-barcode:before{content:"\f02a"}.icon-tag:before{content:"\f02b"}.icon-tags:before{content:"\f02c"}.icon-book:before{content:"\f02d"}.icon-bookmark:before{content:"\f02e"}.icon-print:before{content:"\f02f"}.icon-camera:before{content:"\f030"}.icon-font:before{content:"\f031"}.icon-bold:before{content:"\f032"}.icon-italic:before{content:"\f033"}.icon-text-height:before{content:"\f034"}.icon-text-width:before{content:"\f035"}.icon-align-left:before{content:"\f036"}.icon-align-center:before{content:"\f037"}.icon-align-right:before{content:"\f038"}.icon-align-justify:before{content:"\f039"}.icon-list:before{content:"\f03a"}.icon-indent-left:before{content:"\f03b"}.icon-indent-right:before{content:"\f03c"}.icon-facetime-video:before{content:"\f03d"}.icon-picture:before{content:"\f03e"}.icon-pencil:before{content:"\f040"}.icon-map-marker:before{content:"\f041"}.icon-adjust:before{content:"\f042"}.icon-tint:before{content:"\f043"}.icon-edit:before{content:"\f044"}.icon-share:before{content:"\f045"}.icon-check:before{content:"\f046"}.icon-move:before{content:"\f047"}.icon-step-backward:before{content:"\f048"}.icon-fast-backward:before{content:"\f049"}.icon-backward:before{content:"\f04a"}.icon-play:before{content:"\f04b"}.icon-pause:before{content:"\f04c"}.icon-stop:before{content:"\f04d"}.icon-forward:before{content:"\f04e"}.icon-fast-forward:before{content:"\f050"}.icon-step-forward:before{content:"\f051"}.icon-eject:before{content:"\f052"}.icon-chevron-left:before{content:"\f053"}.icon-chevron-right:before{content:"\f054"}.icon-plus-sign:before{content:"\f055"}.icon-minus-sign:before{content:"\f056"}.icon-remove-sign:before{content:"\f057"}.icon-ok-sign:before{content:"\f058"}.icon-question-sign:before{content:"\f059"}.icon-info-sign:before{content:"\f05a"}.icon-screenshot:before{content:"\f05b"}.icon-remove-circle:before{content:"\f05c"}.icon-ok-circle:before{content:"\f05d"}.icon-ban-circle:before{content:"\f05e"}.icon-arrow-left:before{content:"\f060"}.icon-arrow-right:before{content:"\f061"}.icon-arrow-up:before{content:"\f062"}.icon-arrow-down:before{content:"\f063"}.icon-share-alt:before,.icon-mail-forward:before{content:"\f064"}.icon-resize-full:before{content:"\f065"}.icon-resize-small:before{content:"\f066"}.icon-plus:before{content:"\f067"}.icon-minus:before{content:"\f068"}.icon-asterisk:before{content:"\f069"}.icon-exclamation-sign:before{content:"\f06a"}.icon-gift:before{content:"\f06b"}.icon-leaf:before{content:"\f06c"}.icon-fire:before{content:"\f06d"}.icon-eye-open:before{content:"\f06e"}.icon-eye-close:before{content:"\f070"}.icon-warning-sign:before{content:"\f071"}.icon-plane:before{content:"\f072"}.icon-calendar:before{content:"\f073"}.icon-random:before{content:"\f074"}.icon-comment:before{content:"\f075"}.icon-magnet:before{content:"\f076"}.icon-chevron-up:before{content:"\f077"}.icon-chevron-down:before{content:"\f078"}.icon-retweet:before{content:"\f079"}.icon-shopping-cart:before{content:"\f07a"}.icon-folder-close:before{content:"\f07b"}.icon-folder-open:before{content:"\f07c"}.icon-resize-vertical:before{content:"\f07d"}.icon-resize-horizontal:before{content:"\f07e"}.icon-bar-chart:before{content:"\f080"}.icon-twitter-sign:before{content:"\f081"}.icon-facebook-sign:before{content:"\f082"}.icon-camera-retro:before{content:"\f083"}.icon-key:before{content:"\f084"}.icon-cogs:before{content:"\f085"}.icon-comments:before{content:"\f086"}.icon-thumbs-up:before{content:"\f087"}.icon-thumbs-down:before{content:"\f088"}.icon-star-half:before{content:"\f089"}.icon-heart-empty:before{content:"\f08a"}.icon-signout:before{content:"\f08b"}.icon-linkedin-sign:before{content:"\f08c"}.icon-pushpin:before{content:"\f08d"}.icon-external-link:before{content:"\f08e"}.icon-signin:before{content:"\f090"}.icon-trophy:before{content:"\f091"}.icon-github-sign:before{content:"\f092"}.icon-upload-alt:before{content:"\f093"}.icon-lemon:before{content:"\f094"}.icon-phone:before{content:"\f095"}.icon-check-empty:before{content:"\f096"}.icon-bookmark-empty:before{content:"\f097"}.icon-phone-sign:before{content:"\f098"}.icon-twitter:before{content:"\f099"}.icon-facebook:before{content:"\f09a"}.icon-github:before{content:"\f09b"}.icon-unlock:before{content:"\f09c"}.icon-credit-card:before{content:"\f09d"}.icon-rss:before{content:"\f09e"}.icon-hdd:before{content:"\f0a0"}.icon-bullhorn:before{content:"\f0a1"}.icon-bell:before{content:"\f0a2"}.icon-certificate:before{content:"\f0a3"}.icon-hand-right:before{content:"\f0a4"}.icon-hand-left:before{content:"\f0a5"}.icon-hand-up:before{content:"\f0a6"}.icon-hand-down:before{content:"\f0a7"}.icon-circle-arrow-left:before{content:"\f0a8"}.icon-circle-arrow-right:before{content:"\f0a9"}.icon-circle-arrow-up:before{content:"\f0aa"}.icon-circle-arrow-down:before{content:"\f0ab"}.icon-globe:before{content:"\f0ac"}.icon-wrench:before{content:"\f0ad"}.icon-tasks:before{content:"\f0ae"}.icon-filter:before{content:"\f0b0"}.icon-briefcase:before{content:"\f0b1"}.icon-fullscreen:before{content:"\f0b2"}.icon-group:before{content:"\f0c0"}.icon-link:before{content:"\f0c1"}.icon-cloud:before{content:"\f0c2"}.icon-beaker:before{content:"\f0c3"}.icon-cut:before{content:"\f0c4"}.icon-copy:before{content:"\f0c5"}.icon-paper-clip:before{content:"\f0c6"}.icon-save:before{content:"\f0c7"}.icon-sign-blank:before{content:"\f0c8"}.icon-reorder:before{content:"\f0c9"}.icon-list-ul:before{content:"\f0ca"}.icon-list-ol:before{content:"\f0cb"}.icon-strikethrough:before{content:"\f0cc"}.icon-underline:before{content:"\f0cd"}.icon-table:before{content:"\f0ce"}.icon-magic:before{content:"\f0d0"}.icon-truck:before{content:"\f0d1"}.icon-pinterest:before{content:"\f0d2"}.icon-pinterest-sign:before{content:"\f0d3"}.icon-google-plus-sign:before{content:"\f0d4"}.icon-google-plus:before{content:"\f0d5"}.icon-money:before{content:"\f0d6"}.icon-caret-down:before{content:"\f0d7"}.icon-caret-up:before{content:"\f0d8"}.icon-caret-left:before{content:"\f0d9"}.icon-caret-right:before{content:"\f0da"}.icon-columns:before{content:"\f0db"}.icon-sort:before{content:"\f0dc"}.icon-sort-down:before{content:"\f0dd"}.icon-sort-up:before{content:"\f0de"}.icon-envelope-alt:before{content:"\f0e0"}.icon-linkedin:before{content:"\f0e1"}.icon-undo:before,.icon-rotate-left:before{content:"\f0e2"}.icon-legal:before{content:"\f0e3"}.icon-dashboard:before{content:"\f0e4"}.icon-comment-alt:before{content:"\f0e5"}.icon-comments-alt:before{content:"\f0e6"}.icon-bolt:before{content:"\f0e7"}.icon-sitemap:before{content:"\f0e8"}.icon-umbrella:before{content:"\f0e9"}.icon-paste:before{content:"\f0ea"}.icon-lightbulb:before{content:"\f0eb"}.icon-exchange:before{content:"\f0ec"}.icon-cloud-download:before{content:"\f0ed"}.icon-cloud-upload:before{content:"\f0ee"}.icon-user-md:before{content:"\f0f0"}.icon-stethoscope:before{content:"\f0f1"}.icon-suitcase:before{content:"\f0f2"}.icon-bell-alt:before{content:"\f0f3"}.icon-coffee:before{content:"\f0f4"}.icon-food:before{content:"\f0f5"}.icon-file-alt:before{content:"\f0f6"}.icon-building:before{content:"\f0f7"}.icon-hospital:before{content:"\f0f8"}.icon-ambulance:before{content:"\f0f9"}.icon-medkit:before{content:"\f0fa"}.icon-fighter-jet:before{content:"\f0fb"}.icon-beer:before{content:"\f0fc"}.icon-h-sign:before{content:"\f0fd"}.icon-plus-sign-alt:before{content:"\f0fe"}.icon-double-angle-left:before{content:"\f100"}.icon-double-angle-right:before{content:"\f101"}.icon-double-angle-up:before{content:"\f102"}.icon-double-angle-down:before{content:"\f103"}.icon-angle-left:before{content:"\f104"}.icon-angle-right:before{content:"\f105"}.icon-angle-up:before{content:"\f106"}.icon-angle-down:before{content:"\f107"}.icon-desktop:before{content:"\f108"}.icon-laptop:before{content:"\f109"}.icon-tablet:before{content:"\f10a"}.icon-mobile-phone:before{content:"\f10b"}.icon-circle-blank:before{content:"\f10c"}.icon-quote-left:before{content:"\f10d"}.icon-quote-right:before{content:"\f10e"}.icon-spinner:before{content:"\f110"}.icon-circle:before{content:"\f111"}.icon-reply:before,.icon-mail-reply:before{content:"\f112"}.icon-folder-close-alt:before{content:"\f114"}.icon-folder-open-alt:before{content:"\f115"}.icon-expand-alt:before{content:"\f116"}.icon-collapse-alt:before{content:"\f117"}.icon-smile:before{content:"\f118"}.icon-frown:before{content:"\f119"}.icon-meh:before{content:"\f11a"}.icon-gamepad:before{content:"\f11b"}.icon-keyboard:before{content:"\f11c"}.icon-flag-alt:before{content:"\f11d"}.icon-flag-checkered:before{content:"\f11e"}.icon-terminal:before{content:"\f120"}.icon-code:before{content:"\f121"}.icon-reply-all:before{content:"\f122"}.icon-mail-reply-all:before{content:"\f122"}.icon-star-half-full:before,.icon-star-half-empty:before{content:"\f123"}.icon-location-arrow:before{content:"\f124"}.icon-crop:before{content:"\f125"}.icon-code-fork:before{content:"\f126"}.icon-unlink:before{content:"\f127"}.icon-question:before{content:"\f128"}.icon-info:before{content:"\f129"}.icon-exclamation:before{content:"\f12a"}.icon-superscript:before{content:"\f12b"}.icon-subscript:before{content:"\f12c"}.icon-eraser:before{content:"\f12d"}.icon-puzzle-piece:before{content:"\f12e"}.icon-microphone:before{content:"\f130"}.icon-microphone-off:before{content:"\f131"}.icon-shield:before{content:"\f132"}.icon-calendar-empty:before{content:"\f133"}.icon-fire-extinguisher:before{content:"\f134"}.icon-rocket:before{content:"\f135"}.icon-maxcdn:before{content:"\f136"}.icon-chevron-sign-left:before{content:"\f137"}.icon-chevron-sign-right:before{content:"\f138"}.icon-chevron-sign-up:before{content:"\f139"}.icon-chevron-sign-down:before{content:"\f13a"}.icon-html5:before{content:"\f13b"}.icon-css3:before{content:"\f13c"}.icon-anchor:before{content:"\f13d"}.icon-unlock-alt:before{content:"\f13e"}.icon-bullseye:before{content:"\f140"}.icon-ellipsis-horizontal:before{content:"\f141"}.icon-ellipsis-vertical:before{content:"\f142"}.icon-rss-sign:before{content:"\f143"}.icon-play-sign:before{content:"\f144"}.icon-ticket:before{content:"\f145"}.icon-minus-sign-alt:before{content:"\f146"}.icon-check-minus:before{content:"\f147"}.icon-level-up:before{content:"\f148"}.icon-level-down:before{content:"\f149"}.icon-check-sign:before{content:"\f14a"}.icon-edit-sign:before{content:"\f14b"}.icon-external-link-sign:before{content:"\f14c"}.icon-share-sign:before{content:"\f14d"}
\ No newline at end of file
diff --git a/htdocs/js/lib/bootstrap/font/FontAwesome.otf b/htdocs/js/lib/bootstrap/font/FontAwesome.otf
index 64049bf2..32dd8b1c 100755
Binary files a/htdocs/js/lib/bootstrap/font/FontAwesome.otf and b/htdocs/js/lib/bootstrap/font/FontAwesome.otf differ
diff --git a/htdocs/js/lib/bootstrap/font/fontawesome-webfont.eot b/htdocs/js/lib/bootstrap/font/fontawesome-webfont.eot
index 7d81019e..c080283b 100755
Binary files a/htdocs/js/lib/bootstrap/font/fontawesome-webfont.eot and b/htdocs/js/lib/bootstrap/font/fontawesome-webfont.eot differ
diff --git a/htdocs/js/lib/bootstrap/font/fontawesome-webfont.svg b/htdocs/js/lib/bootstrap/font/fontawesome-webfont.svg
index ba0afe5e..10a1e1bb 100755
--- a/htdocs/js/lib/bootstrap/font/fontawesome-webfont.svg
+++ b/htdocs/js/lib/bootstrap/font/fontawesome-webfont.svg
@@ -53,14 +53,14 @@
-
+
-
-
-
+
+
+
-
-
+
+
@@ -70,7 +70,7 @@
-
+
@@ -89,11 +89,11 @@
-
+
-
+
@@ -115,12 +115,12 @@
-
-
+
+
-
-
-
+
+
+
@@ -132,13 +132,13 @@
-
+
-
+
@@ -152,8 +152,8 @@
-
-
+
+
@@ -163,21 +163,21 @@
-
+
-
-
+
+
-
+
-
-
-
+
+
+
@@ -186,9 +186,9 @@
-
+
-
+
@@ -197,7 +197,7 @@
-
+
@@ -230,8 +230,8 @@
-
-
+
+
@@ -255,8 +255,8 @@
-
-
+
+
@@ -271,14 +271,69 @@
-
+
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/htdocs/js/lib/bootstrap/font/fontawesome-webfont.ttf b/htdocs/js/lib/bootstrap/font/fontawesome-webfont.ttf
index d4617247..908f69ec 100755
Binary files a/htdocs/js/lib/bootstrap/font/fontawesome-webfont.ttf and b/htdocs/js/lib/bootstrap/font/fontawesome-webfont.ttf differ
diff --git a/htdocs/js/lib/bootstrap/font/fontawesome-webfont.woff b/htdocs/js/lib/bootstrap/font/fontawesome-webfont.woff
index 3c89ae09..a33af950 100755
Binary files a/htdocs/js/lib/bootstrap/font/fontawesome-webfont.woff and b/htdocs/js/lib/bootstrap/font/fontawesome-webfont.woff differ