From: Calin Burloiu Date: Fri, 26 Aug 2011 15:36:33 +0000 (+0300) Subject: content added; look modifications; side box content X-Git-Url: http://p2p-next.cs.pub.ro/gitweb/?a=commitdiff_plain;h=a27f593acea88d14199517dadf23b40dbc56ff2a;p=living-lab-site.git content added; look modifications; side box content --- diff --git a/.gitignore b/.gitignore index 51743a3..0923b67 100644 --- a/.gitignore +++ b/.gitignore @@ -17,6 +17,8 @@ debug/* docs/tmp/* config.mk *~ +*.exe +*.dmg *.zip *.gz *.bz2 diff --git a/.htaccess b/.htaccess index 25b547b..619cfb5 100644 --- a/.htaccess +++ b/.htaccess @@ -20,5 +20,5 @@ RewriteEngine on -RewriteCond $1 !^(index\.php|img|css|js|data|robots\.txt) +RewriteCond $1 !^(index\.php|img|css|js|data|download|robots\.txt) RewriteRule ^(.*)$ index.php/$1 [L] diff --git a/application/config/article.php b/application/config/article.php new file mode 100644 index 0000000..8e6bc9f --- /dev/null +++ b/application/config/article.php @@ -0,0 +1,10 @@ +lang->load('article'); - $title = $this->lang->line("article_$method"); - if ($title == FALSE) - $title = $method; - $descr = $this->lang->line("article_${method}_description"); - if ($descr == FALSE) - $descr = ''; - $html_params = array( 'title' => - $title.' - '. $this->config->item('site_name'), + $html_params = array('title' => $this->title.' - ' + . $this->config->item('site_name'), 'css' => array( 'jquery-ui.css' - ), - //'js' => array(), - 'metas' => array('description'=>$descr) + ), + 'js' => array( + 'jquery.js', + 'jquery-ui.js' + ), + 'metas' => + array('description'=>$this->metaDescription) ); $this->load->library('html_head_params', $html_params); @@ -44,8 +45,7 @@ class Article extends Article_Controller { $this->load->view('header', array('selected_menu' => $method)); $main_params['content'] = $this->_load($method, $params); - // TODO side - $main_params['side'] = '

Side Box

TODO: Put side box content here

'; + $main_params['side'] = $this->load->view('side_default.php', NULL, TRUE); $this->load->view('main', $main_params); $this->load->view('footer'); diff --git a/application/controllers/catalog.php b/application/controllers/catalog.php index f3df836..087275d 100644 --- a/application/controllers/catalog.php +++ b/application/controllers/catalog.php @@ -45,8 +45,11 @@ class Catalog extends CI_Controller { 'css' => array( 'catalog.css', 'jquery-ui.css' - ), - //'js' => array(), + ), + 'js' => array( + 'jquery.js', + 'jquery-ui.js' + ), //'metas' => array('description'=>'','keywords'=>'') ); $this->load->library('html_head_params', $params); @@ -58,8 +61,7 @@ class Catalog extends CI_Controller { $this->load->view('header', array('selected_menu' => 'home')); $main_params['content'] = $this->load->view('catalog/index_view', $data, TRUE); - // TODO: side - $main_params['side'] = '

Side Box

TODO: Put side box content here

'; + $main_params['side'] = $this->load->view('side_default.php', NULL, TRUE); $this->load->view('main', $main_params); $this->load->view('footer'); @@ -72,7 +74,10 @@ class Catalog extends CI_Controller { 'css' => array( 'jquery-ui.css' ), - //'js' => array(), + 'js' => array( + 'jquery.js', + 'jquery-ui.js' + ), //'metas' => array('description'=>'','keywords'=>'') ); $this->load->library('html_head_params', $params); @@ -125,8 +130,11 @@ class Catalog extends CI_Controller { 'css' => array( 'catalog.css', 'jquery-ui.css' - ), - //'js' => array(), + ), + 'js' => array( + 'jquery.js', + 'jquery-ui.js' + ), //'metas' => array('description'=>'','keywords'=>'') ); $this->load->library('html_head_params', $params); diff --git a/application/core/Article_Controller.php b/application/core/Article_Controller.php index f98bb11..e6a50aa 100644 --- a/application/core/Article_Controller.php +++ b/application/core/Article_Controller.php @@ -3,30 +3,68 @@ * Library Article_Controller can be extended by a controller to be used for * content pages that depend on the language. * - * Several language specific parameters can be coded in language files. - * Non language specific parameters can be putted in config files. + * The page views are usually located in + * "application/views/article/$language/$method". + * Parameters: + * * - * @category Library + * @category Base Controller Library * @author Călin-Andrei Burloiu */ class Article_Controller extends CI_Controller { + protected $title = NULL; + protected $metaDescription = NULL; + protected $helpers = array(); + protected $libraries = array(); + function __construct() { parent::__construct(); + + // Language, title and description + $this->lang->load('article'); + + // Helpers and libraries. + $this->config->load('article'); } /** - * Override this with site specific information (header, menus...) and call + * Extend this with site specific information (header, menus...) and call * $this->_load which is a generic method that loads the article. * Both parameters must be passed to $this->_load. */ public function _remap($method, $params = array()) { - $this->load->view('echo', - array('output' => $this->_load($method, $params), - 'clear' => TRUE) - ); + // Title + $this->title = $this->lang->line("article_$method"); + if ($this->title === FALSE) + $this->title = $method; + + // Meta Description + $this->metaDescription = $this->lang->line("article_${method}_description"); + if ($this->metaDescription === FALSE) + $this->metaDescription = ''; + + // Helpers + $this->helpers = $this->config->item("article_${method}_helpers"); + if ($this->helpers !== FALSE) + $this->load->helper($this->helpers); + + // Libraries + $this->libraries = $this->config->item("article_${method}_library"); + if ($this->libraries !== FALSE) + $this->load->library($libraries); } /** diff --git a/application/language/english/ui_lang.php b/application/language/english/ui_lang.php index adbbb0c..af184ee 100644 --- a/application/language/english/ui_lang.php +++ b/application/language/english/ui_lang.php @@ -4,9 +4,10 @@ $lang['ui_nav_menu_home'] = 'Home'; $lang['ui_nav_menu_install_plugins'] = 'Install Plugins'; $lang['ui_nav_menu_about'] = 'About'; +$lang['ui_nav_menu_help'] = 'Help'; +$lang['ui_nav_menu_contact'] = 'Contact'; $lang['ui_nav_menu_log_in'] = 'Log In'; $lang['ui_nav_menu_register'] = 'Register'; -$lang['ui_nav_menu_help'] = 'Help'; $lang['ui_search'] = 'Search'; diff --git a/application/views/article/english/about.php b/application/views/article/english/about.php index af88507..9a9af2e 100644 --- a/application/views/article/english/about.php +++ b/application/views/article/english/about.php @@ -1,12 +1,12 @@

P2P-Next

-

P2P-Next is an integrated FP7 EU project involving more than 20 partners, including University Politehnica of Bucharest (UPB).

+

P2P-Next is an integrated FP7 EU project involving more than 20 partners, including University Politehnica of Bucharest (UPB).

P2P-Next aims to build the next generation Peer-to-Peer (P2P) content delivery platform.

This site provides information on UPB's contribution to the P2P-Next project activities. We are currently part of WP4 (Work Package 4 - IPvNext Networking Fabric) and WP8 (Work Package 8 - Living Lab Trials).

NextShare Video Plugins

NextSharePC
-
a media-player browser plugin which uses VLC libraries for video rendering and incorporates P2P technology for VideoOnDemand (VoD) and LiveStreaming content delivery. The plugin is currently working with Internet Explorer and Firefox on Windows.
+
a media-player browser plugin which uses VLC libraries for video rendering and incorporates P2P technology for VideoOnDemand (VoD) and LiveStreaming content delivery. The plugin is currently working with Internet Explorer and Firefox on Windows.
SwarmPlayer
@@ -25,15 +25,15 @@ NextSharePC - win VLC + win VLC

win Windows

win Mac OS X

-

win Mozilla Firefox 3.5 or greater

-

win Internet Explorer 7.0 or greater

+

win Mozilla Firefox 3.5 or greater

+

win Internet Explorer 7.0 or greater

@@ -41,7 +41,7 @@ SwarmPlayer - win HTML5 + win HTML5

win Windows

@@ -49,8 +49,8 @@

win Mac OS X

-

win Mozilla Firefox 3.5 or greater

-

win Internet Explorer 7.0 or greater

+

win Mozilla Firefox 3.5 or greater

+

win Internet Explorer 7.0 or greater

@@ -62,10 +62,6 @@
  • from feature films
  • from TechTalks technical presentations
  • or from various events from our faculty
    • -
  • from karaoke parties in Automatic Control and Computers Faculty
    • +
  • from karaoke parties in Automatic Control and Computers Faculty
    • -

    All available movies are currently seeded by 5 peers with high bandwidth (1Gbit) kindly provided by the NCIT-Cluster. Anyone that watches a movie will take part in the swarm and ensure greater availability to provided content.

    - - \ No newline at end of file +

    All available movies are currently seeded by 5 peers with high bandwidth (1Gbit) kindly provided by the NCIT-Cluster. Anyone that watches a movie will take part in the swarm and ensure greater availability to provided content.

    \ No newline at end of file diff --git a/application/views/article/english/contact.php b/application/views/article/english/contact.php new file mode 100644 index 0000000..7aad0db --- /dev/null +++ b/application/views/article/english/contact.php @@ -0,0 +1,10 @@ +

    Contact and support

    +

    In case there are issues getting NextShare plugins to work or for any other information or suggestion, please contact us: + +

    +
    email E-mail:
    +
    + + +
    +
    \ No newline at end of file diff --git a/application/views/article/english/install-plugins.php b/application/views/article/english/install-plugins.php index 1ef7494..a8550af 100644 --- a/application/views/article/english/install-plugins.php +++ b/application/views/article/english/install-plugins.php @@ -1,11 +1,20 @@ -

    Install Plugins

    -

    install plugins instructions

    -

    install plugins instructions

    -

    install plugins instructions

    -

    install plugins instructions

    -

    install plugins instructions

    -

    install plugins instructions

    -

    install plugins instructions

    -

    install plugins instructions

    -

    install plugins instructions

    -

    install plugins instructions

    \ No newline at end of file +

    NextShare Plugins

    +
      +
    1. SwarmPlayer (based on HTML5)
      2. +
    2. NextSharePC (based on VLC)
      3. +
    + +

    SwarmPlayer

    +

    To install SwarmPlayer video plugin which is based on HTML5 visit P2P-Next's SwarmPlayer Site. You should find a green button there labeled "Add Swarmplayer...", click it and follow the instructions.

    +SwarmPlayer Site + +

    NextSharePC

    +

    To install NextSharePC video plugin which is based on VLC do the following:

    +
      +
    1. If you are using: +

      win Windows run the Windows installer.

      win a Mac run the Mac OS X installer.

      +
    2. Restart your browser and revisit the page.
      3. +
    3. Enjoy! ;)
      4. +
    \ No newline at end of file diff --git a/application/views/footer.php b/application/views/footer.php index dc32852..42c4948 100644 --- a/application/views/footer.php +++ b/application/views/footer.php @@ -1,3 +1,3 @@ diff --git a/application/views/header.php b/application/views/header.php index 3ec4f1e..dccb112 100644 --- a/application/views/header.php +++ b/application/views/header.php @@ -14,6 +14,9 @@ endif ?>
  • >lang->line('ui_nav_menu_help') ?>
    • + +
  • >lang->line('ui_nav_menu_contact') ?>
  • >lang->line('ui_nav_menu_register') ?>
    • diff --git a/application/views/side_default.php b/application/views/side_default.php new file mode 100644 index 0000000..a6d0589 --- /dev/null +++ b/application/views/side_default.php @@ -0,0 +1,25 @@ +
    + + +
    + + \ No newline at end of file diff --git a/css/default.css b/css/default.css index 900e049..7f7507e 100644 --- a/css/default.css +++ b/css/default.css @@ -3,7 +3,7 @@ body margin: 0; font-family: Arial, Helvetica, sans-serif; font-size: 75%; - background: white url('/devel/img/bg.png') repeat-x left 90px; + background: white url('/devel/img/bg.png') repeat-x left 88px; } a:link @@ -26,6 +26,19 @@ h1 margin-bottom: 8px; } +.inline +{ + vertical-align: middle; +} + +.container-install +{ + width: 192px; + margin: 0 auto; + margin-top: 8px; + margin-bottom: 8px; +} + #nav-menu {/* left: 0; @@ -49,7 +62,7 @@ h1 #nav-menu a:link, #nav-menu a:visited { display: block; - height: 14px; + height: 12px; color: white; text-align: center; line-height: 100%; @@ -58,18 +71,26 @@ h1 padding-bottom: 5px; padding-left: 16px; padding-right: 16px; + border: 1px solid transparent; text-decoration: none; } +#nav-menu a:hover +{ + background-color: rgb(90,148,216); + border: 1px outset rgb(0,90,192); +} +#nav-menu a:active +{ + background-color: rgb(90,148,216); + border: 1px inset rgb(60,128,208); +} #nav-menu a.selected { background-color: rgb(60,128,208); + border: 1px inset rgb(60,128,208); color: #FFE4B5; font-weight: bold; } -#nav-menu a:hover, #nav-menu a:active -{ - background-color: rgb(90,148,216); -} #header { @@ -78,9 +99,9 @@ h1 top: 24px; left: 0; width: 100%;*/ - height: 64px; + height: 62px; background: #e5ecf5; - border-bottom: 2px ridge rgb(60,128,208); + border: 1px outset #e5ecf5; } #logo @@ -123,8 +144,10 @@ h1 font-weight: bold; color: #000D60; text-align: left; - padding: 10px 0px 0px 10px; + padding: 0px 0px 0px 8px; + margin: 8px 0px 8px 0px; background: url(/devel/img/header.png) top repeat-x; + outline: 1px outset rgb(108,162,222); clear: both; } @@ -143,6 +166,11 @@ h1 vertical-align: middle; } +#main dt +{ + font-weight: bold; +} + #content { float: left; @@ -162,10 +190,11 @@ h1 #footer { clear: both; - border-top: 2px ridge rgb(60,128,208); - padding-top: 8px; - padding-bottom: 8px; + border: 1px outset #e5ecf5; + padding-top: 0.5em; + padding-bottom: 0.4em; background: #e5ecf5; + font-size: 0.9em; text-align: center; } diff --git a/img/SwarmPlayer-site.jpg b/img/SwarmPlayer-site.jpg new file mode 100644 index 0000000..d4dc354 Binary files /dev/null and b/img/SwarmPlayer-site.jpg differ diff --git a/img/email-icon.png b/img/email-icon.png new file mode 100644 index 0000000..f966515 Binary files /dev/null and b/img/email-icon.png differ