From a7d21dbe907800e2a0c2d089831b8db2a315a5a6 Mon Sep 17 00:00:00 2001
From: Cameron <e107inc@gmail.com>
Date: Tue, 31 Jan 2017 17:12:04 -0800
Subject: [PATCH] Downloads: Introduced {DOWNLOAD_REQUEST_URL} which is just
 the file download url.

---
 e107_plugins/download/download_shortcodes.php | 18 +++++++++++++-----
 e107_themes/bootstrap3/admin_style.css        |  6 +++++-
 2 files changed, 18 insertions(+), 6 deletions(-)

diff --git a/e107_plugins/download/download_shortcodes.php b/e107_plugins/download/download_shortcodes.php
index 046ff63e8..480944394 100644
--- a/e107_plugins/download/download_shortcodes.php
+++ b/e107_plugins/download/download_shortcodes.php
@@ -378,13 +378,21 @@ class download_shortcodes extends e_shortcode
      	}
      	else
      	{
-     		$url = e107::getUrl()->create('download/request/item',array('id'=>$this->var['download_id'], 'name'=>$this->var['download_sef']));	
+     		$url = $this->sc_download_request_url();
      	  	return ($pref['agree_flag'] ? "<a class='e-tip' title='".LAN_DOWNLOAD."' href='".$url."' onclick= \"return confirm('{$agreetext}');\">{$img}</a>" : "<a class='e-tip' title='".LAN_DOWNLOAD."' href='".$url."' >{$img}</a>");
    
 		//	return ($pref['agree_flag'] ? "<a class='e-tip' title='".LAN_DOWNLOAD."' href='".e_PLUGIN_ABS."download/request.php?".$this->var['download_id']."' onclick= \"return confirm('{$agreetext}');\">{$img}</a>" : "<a class='e-tip' title='".LAN_DOWNLOAD."' href='".e_PLUGIN_ABS."download/request.php?".$this->var['download_id']."' >{$img}</a>");
      	}
    }
-   
+
+
+   function sc_download_request_url($parm=null)
+   {
+    	return e107::getUrl()->create('download/request/item',array('id'=>$this->var['download_id'], 'name'=>$this->var['download_sef']));
+
+   }
+
+
    
    function sc_download_list_icon($parm='') //XXX FIXME $img. 
    {
@@ -484,7 +492,7 @@ class download_shortcodes extends e_shortcode
 		$tp = e107::getParser();
 
 		$viewUrl = e107::getUrl()->create('download/view/item',array('id'=>$this->var['download_id'], 'name'=>$this->var['download_sef']));	
-		$requestUrl = e107::getUrl()->create('download/request/item',array('id'=>$this->var['download_id'], 'name'=>$this->var['download_sef']));	
+		$requestUrl = $this->sc_download_request_url();
 
 		$link['view'] = "<a href='".$viewUrl."'>".$this->var['download_name']."</a>";
 		$link['request'] = "<a href='".$requestUrl."' title='".LAN_dl_46."'>".$this->var['download_name']."</a>";
@@ -506,7 +514,7 @@ class download_shortcodes extends e_shortcode
       global $dl;
 	  $tp = e107::getParser();
 	  $pref = e107::getPref();
-	  $url = e107::getUrl()->create('download/request/item',array('id'=>$dl['download_id'], 'name'=>$dl['download_sef']));	
+	  $url = $this->sc_download_request_url();
 	  
       if ($pref['agree_flag'] == 1) 
       {
@@ -641,7 +649,7 @@ class download_shortcodes extends e_shortcode
       		$click = " onclick='return confirm(\"".$tp->toJS($tp->toHTML($pref['agree_text'],true,'emotes, no_tags'))."\")'";
 		}
 		
-		$url = e107::getUrl()->create('download/request/item',array('id'=>$this->var['download_id'], 'name'=>$this->var['download_sef']));	
+		$url = $this->sc_download_request_url();
      	
      	if(varset($parm['type']) == 'href')
 		{
diff --git a/e107_themes/bootstrap3/admin_style.css b/e107_themes/bootstrap3/admin_style.css
index 3c7403942..6339f56d7 100644
--- a/e107_themes/bootstrap3/admin_style.css
+++ b/e107_themes/bootstrap3/admin_style.css
@@ -1,5 +1,9 @@
 
-body						{ padding-top: 75px;  }
+body						{ padding-top: 75px;
+font-family: "Helvetica Neue",Helvetica,Arial,sans-serif;
+font-size: 14px;
+
+ }
 
 @media (max-width: 992px) {
     body { height: 100vh; overflow-y: auto!important; }