Synnefo

#!/bin/bash

if [ $# -ne 3 ]; then

  echo "$0 localbranch remotedebian remoteupstream"

  exit 1

fi

LOCALBRANCH=$1

REMOTEDEBIAN=$2

REMOTEUPSTREAM=$3

BUILDAREA=~/build-area

PKGAREA=~/packages

BACKUPAREA=~/backup

PACKAGES="

  snf-astakos-app

  snf-common

  snf-webproject

  snf-cyclades-app

  snf-cyclades-gtools

  snf-tools

  snf-pithos-app

  snf-pithos-backend

  snf-pithos-tools"

set -e

test -d $BUILDAREA

test -d $PKGAREA

test -d $BACKUPAREA

#TODO: check for up-to-date branches

git checkout $LOCALBRANCH

git checkout $REMOTEUPSTREAM

git checkout $REMOTEDEBIAN

TMPDEBIAN=$(mktemp -u debian.XXX)

# create tmp debian branch to do everything

git checkout --track $REMOTEDEBIAN -b $TMPDEBIAN

mrgextra=-m

mrgmsg="Merge branch '$REMOTEUPSTREAM' into $REMOTEDEBIAN"

dchextra=-R

# whether we are in snapshot or release mode

snap=false

tcdialog --defaultno --yesno "Create Snapshot?" 5 20 && snap=true && dchextra=-S && mrgextra= && mrgmsg=

# merge local branch to tmp branch with correct msg so that it can be pushes as is to upstream debian

git merge --no-edit $mrgextra ${mrgextra:+"$mrgmsg"} $LOCALBRANCH

# auto edit changlog depending on Snapshot or Release mode

export EDITOR=/usr/bin/vim

git-dch --debian-branch=$TMPDEBIAN --git-author --ignore-regex=".*" --multimaint-merge --since=HEAD $dchextra

git add debian/changelog

# get version from the changelog

# we tag here in order sdist to work as expexted.

version=$(IFS="()" ; read  x v x < debian/changelog  ; echo $v)

if ! $snap; then

  git commit -s -a -m "Bump new upstream version"

  TAGFILE=$(mktemp -t tag.XXX)

  tcdialog --inputbox "New Debian Tag: " 5 30 "debian/$version" 2>$TAGFILE

  git tag $(<$TAGFILE)

fi

rm -rf $BUILDAREA/*

for p in $PACKAGES; do

  cd  $p

  python setup.py sdist

  grep "__version_vcs" -r . -l -I | xargs git add -f

  cd -

done

git-buildpackage --git-export-dir=$BUILDAREA \

                 --git-upstream-branch=$REMOTEUPSTREAM \

                 --git-debian-branch=$TMPDEBIAN \

                 --git-export=INDEX \

                 --git-ignore-new -sa

# do some dirty backup

# pkgarea might be needed by auto-deploy tool

rm -f $PKGAREA/* || true

cp -v $BUILDAREA/*deb $PKGAREA/ || true

cp -v $BUILDAREA/* $BACKUPAREA/ || true

git reset --hard HEAD

if $snap ; then

  git checkout $LOCALBRANCH

  git branch -D $TMPDEBIAN

else

  # here we can push as is the commits in remote debian branch

  echo "########### All OK #####################"

  echo "git push origin $REMOTEDEBIAN"

  echo "git checkout $LOCALBRANCH"

  echo

  echo "############ Revert ######################"

  echo "git tag -d " $(<$TAGFILE)

  rm $TAGFILE

fi

#!/usr/bin/env python2.6

# -*- coding: utf-8 -*-

from os import path

import shutil, sys, virtualenv, subprocess

PROJECT_ROOT = path.abspath(path.dirname(__file__))

REQUIREMENTS = path.join(PROJECT_ROOT, 'requirements.pip')

VE_ROOT = path.join(PROJECT_ROOT, '.ve')

VE_TIMESTAMP = path.join(VE_ROOT, 'timestamp')

envtime = path.exists(VE_ROOT) and path.getmtime(VE_ROOT) or 0

envreqs = path.exists(VE_TIMESTAMP) and path.getmtime(VE_TIMESTAMP) or 0

envspec = path.getmtime(REQUIREMENTS)

def go_to_ve():

    # going into ve

    if not sys.prefix == VE_ROOT:

        if sys.platform == 'win32':

            python = path.join(VE_ROOT, 'Scripts', 'python.exe')

        else:

            python = path.join(VE_ROOT, 'bin', 'python')

        retcode = subprocess.call([python, __file__] + sys.argv[1:])

        sys.exit(retcode)

update_ve = 'update_ve' in sys.argv

if update_ve or envtime < envspec or envreqs < envspec:

    if update_ve:

        # install ve

        if envtime < envspec:

            if path.exists(VE_ROOT):

                shutil.rmtree(VE_ROOT)

            virtualenv.logger = virtualenv.Logger(consumers=[])

            virtualenv.create_environment(VE_ROOT, site_packages=True)

        go_to_ve()    

        # check requirements

        if update_ve or envreqs < envspec:

            import pip

            pip.main(initial_args=['install', '-r', REQUIREMENTS])

            file(VE_TIMESTAMP, 'w').close()

        sys.exit(0)

    else:

        print "VirtualEnv need to be updated"

        print "Run ./manage.py update_ve"

        sys.exit(1)

go_to_ve()

# run django

from django.core.management import execute_manager

try:

    import settings # Assumed to be in the same directory.

    import os

    path = os.path.normpath(os.path.join(os.getcwd(), '..'))

    sys.path.append(path)

except ImportError:

    import sys

    sys.stderr.write("Error: Can't find the file 'settings.py' in the directory")

    sys.exit(1)

if __name__ == "__main__":

    execute_manager(settings)

Django==1.2.4

simplejson==2.1.3

pycurl==7.19.0

python-dateutil==1.4.1

django-hudson

MySQL-python==1.2.3

psycopg2==2.4

south==0.7.1

amqplib==0.6.1

lockfile==0.8

python-daemon==1.5.5

pycrypto==2.1.0

IPy==0.75

-e git+https://code.grnet.gr/git/vncauthproxy@v1.0#egg=vncauthproxy

DATABASES = {

	    'default': {

		'ENGINE': 'django.db.backends.mysql',

		'NAME': 'synnefo',

		'USER': 'synnefo',

		'PASSWORD': 'synnefo',

		'HOST': 'localhost',

		'PORT': '3128',

		'OPTIONS': {

		    'init_command': 'SET storage_engine=INNODB',

		}

	    }

	}

BACKEND_PREFIX_ID = "jenkins-"

INSTALLED_APPS += ('django_hudson',)

#One year

AUTH_TOKEN_DURATION = 24 * 365

DATABASES = {

	    'default': {

		'ENGINE': 'django.db.backends.postgresql_psycopg2',

		'NAME': 'synnefo',

		'USER': 'synnefo',

		'PASSWORD': 'synnefo',

		'HOST': '127.0.0.1'

	    }

}

BACKEND_PREFIX_ID = "jenkins-"

INSTALLED_APPS += ('django_hudson',)

#One year

AUTH_TOKEN_DURATION = 24 * 365

DATABASES = {

	    'default': {

		'ENGINE': 'django.db.backends.sqlite3',

		'NAME': PROJECT_PATH + 'synnefo.db' #WARN: This must be an absolute path

    }

}

BACKEND_PREFIX_ID = "jenkins-"

INSTALLED_APPS += ('django_hudson',)

#One year

AUTH_TOKEN_DURATION = 24 * 365

--- rlib2.py    2011-07-17 20:45:56.000000000 +0300

+++ rlib2.py.20110717   2011-07-17 20:45:51.000000000 +0300

@@ -785,7 +785,7 @@

     src_node=baserlib.CheckParameter(data, "src_node", default=None),

     src_path=baserlib.CheckParameter(data, "src_path", default=None),

     start=baserlib.CheckParameter(data, "start", default=True),

-    wait_for_sync=baserlib.CheckParameter(data, "wait_for_sync", default=True),

+    wait_for_sync=True,

     ip_check=baserlib.CheckParameter(data, "ip_check", default=True),

     name_check=baserlib.CheckParameter(data, "name_check", default=True),

     file_storage_dir=baserlib.CheckParameter(data, "file_storage_dir",

--- kvm-vif-bridge	2011-06-05 11:52:48.000000000 +0300

+++ /etc/ganeti/kvm-vif-bridge	2011-06-05 11:55:16.000000000 +0300

@@ -91,6 +91,10 @@

 	routed_setup_ipv6

 	routed_setup_firewall

 	routed_setup_nfdhcpd

+

+    # Quick and dirty hack for the development platform

+    # also *bridge* the interface to br0, to support host-based NAT

+    brctl addif br0 $INTERFACE

 elif [ "$MODE" = "bridged" ]; then

 	ifconfig $INTERFACE 0.0.0.0 up

 	brctl addif $BRIDGE $INTERFACE

diff --git a/nfdhcpd b/nfdhcpd

index c3bdcc7..19e8d6c 100755

--- a/nfdhcpd

+++ b/nfdhcpd

@@ -1,4 +1,4 @@

-#!/usr/bin/env python

+#!/usr/bin/env python2.7

 #

 # nfdcpd: A promiscuous, NFQUEUE-based DHCP server for virtual machine hosting

@@ -496,7 +496,9 @@ class VMNetProxy(object): # pylint: disable=R0902

         """ Generate a reply to a BOOTP/DHCP request

         """

-        indev = payload.get_indev()

+        # If the packet comes from a bridged interface, use the ifindex

+        # of the physical device instead of the ifindex of the bridge interface

+        indev = payload.get_physindev() or payload.get_indev()

         try:

             # Get the actual interface from the ifindex

             iface = self.ifaces[indev]

@@ -537,7 +539,7 @@ class VMNetProxy(object): # pylint: disable=R0902

             return

         resp = Ether(dst=mac, src=self.get_iface_hw_addr(iface))/\

-               IP(src=DHCP_DUMMY_SERVER_IP, dst=binding.ip)/\

+               IP(src=self.dhcp_server_ip, dst=binding.ip)/\

                UDP(sport=pkt.dport, dport=pkt.sport)/resp

         subnet = self.subnets[binding.link]

@@ -593,7 +595,7 @@ class VMNetProxy(object): # pylint: disable=R0902

         # Finally, always add the server identifier and end options

         dhcp_options += [

             ("message-type", resp_type),

-            ("server_id", DHCP_DUMMY_SERVER_IP),

+            ("server_id", self.dhcp_server_ip),

             "end"

         ]

         resp /= DHCP(options=dhcp_options)

@@ -606,7 +608,7 @@ class VMNetProxy(object): # pylint: disable=R0902

         """ Generate a reply to a BOOTP/DHCP request

         """

-        indev = payload.get_indev()

+        indev = payload.get_physindev() or payload.get_indev()

         try:

             # Get the actual interface from the ifindex

             iface = self.ifaces[indev]

@@ -641,7 +643,7 @@ class VMNetProxy(object): # pylint: disable=R0902

         """ Generate a reply to an ICMPv6 neighbor solicitation

         """

-        indev = payload.get_indev()

+        indev = payload.get_physindev() or payload.get_indev()

         try:

             # Get the actual interface from the ifindex

             iface = self.ifaces[indev]

root@store67:~/src/python-nfqueue# diff -ur original/nfqueue-bindings-0.3/ mine/nfqueue-bindings-0.3|grep -v ^Only

diff -ur original/nfqueue-bindings-0.3//libnetfilter_queue.i mine/nfqueue-bindings-0.3/libnetfilter_queue.i

--- original/nfqueue-bindings-0.3//libnetfilter_queue.i 2009-10-18 18:37:28.000000000 +0300

+++ mine/nfqueue-bindings-0.3/libnetfilter_queue.i      2011-06-05 10:58:46.000000000 +0300

@@ -51,6 +51,7 @@

 %extend payload {

         int get_nfmark();

         int get_indev();

+        int get_physindev();

         int get_outdev();

 unsigned int get_length(void) {

diff -ur original/nfqueue-bindings-0.3//nfq_common.c mine/nfqueue-bindings-0.3/nfq_common.c

--- original/nfqueue-bindings-0.3//nfq_common.c 2009-10-18 18:37:28.000000000 +0300

+++ mine/nfqueue-bindings-0.3/nfq_common.c      2011-06-05 10:59:54.000000000 +0300

@@ -192,6 +192,11 @@

         return nfq_get_indev(self->nfad);

 }

+int payload_get_physindev(struct payload *self)

+{

+        return nfq_get_physindev(self->nfad);

+}

+

 int payload_get_outdev(struct payload *self)

 {

         return nfq_get_outdev(self->nfad);

diff -ur original/nfqueue-bindings-0.3//nfq_common.h mine/nfqueue-bindings-0.3/nfq_common.h

--- original/nfqueue-bindings-0.3//nfq_common.h 2009-10-18 18:37:28.000000000 +0300

+++ mine/nfqueue-bindings-0.3/nfq_common.h      2011-06-05 10:59:18.000000000 +0300

@@ -32,6 +32,8 @@

 int payload_get_indev(struct payload *self);

+int payload_get_physindev(struct payload *self);

+

 int payload_get_outdev(struct payload *self);

 #endif /* __NFQ_COMMON__ */

django_extensions

Sphinx>=1.1.2

pithos.html

<!doctype html>

<!--[if lt IE 7 ]> <html lang="en" class="no-js ie6"> <![endif]-->

<!--[if IE 7 ]>    <html lang="en" class="no-js ie7"> <![endif]-->

<!--[if IE 8 ]>    <html lang="en" class="no-js ie8"> <![endif]-->

<!--[if (gte IE 9)|!(IE)]><!--> <html lang="en" class="no-js"> <!--<![endif]-->

<head>

    <meta charset="utf-8">

  <!-- Always force latest IE rendering engine (even in intranet) & Chrome Frame

       Remove this if you use the .htaccess -->

  <meta http-equiv="X-UA-Compatible" content="chrome=1">

  <title>~okeanos</title>

  <meta name="description" content="Pithos+ GRNet Service">

  <meta name="author" content="Kostas Papadimitriou <kpap@grnet.gr>">

  <!--  Mobile viewport optimized: j.mp/bplateviewport -->

  <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1">

    <!-- Place favicon.ico & apple-touch-icon.png

        in the root of your domain and delete these references -->

  <link rel="shortcut icon" href="/favicon.ico">

  <link rel="apple-touch-icon" href="/apple-touch-icon.png">

  <link rel="stylesheet" href="site_media/css/site.css">

  <script src="site_media/js/libs/modernizr-1.7.min.js"></script>

  <script src="https://ajax.googleapis.com/ajax/libs/jquery/1.4.2/jquery.min.js"></script>

  <script>

    var CLOUDBAR_ACTIVE_SERVICE = 'okeanos';

    var CLOUDBAR_LOCATION = "/static/im/cloudbar/";

    var CLOUDBAR_SERVICES = "/im/get_services";

    var CLOUDBAR_MENU = "/im/get_menu";

    $(document).ready(function(){

      $.getScript(CLOUDBAR_LOCATION + 'cloudbar.js');

    })

  </script>

</head>

<body id="index" style="background-position: 0px -200px">

    <div class="container">

        <div class="logo">

            <a href="#" title="Pithos+"><img 

                src="site_media/images/okeanos-logo-alpha.png" 

                alt="~okeanos" 

                title="~okeanos" /></a>

        </div>

        <div class="inner box-round-mid box-shadow-mid clearfix">

            <div class="cols clearfix">

                <div class="main-content">

    <div class="intro-text page text">

        <p>

        Η έκδοση alpha 2 της υπηρεσίας ~okeanos θα είναι σύντομα διαθέσιμη.<br /><br />

        Αν έχετε λογαριασμό θα λάβετε ενημερωτικό μήνυμα στο email σας.<br />

        Αν δεν έχετε, φτιάξτε έναν <a href="/im">τώρα</a>!

        </p>

    </div>

</div>

            </div>

        </div>

    </div>

</div>

</div>

<div class="footer">

<div class="bottom-text">

    <p>&copy; 2011 <a target="_blank" href="http://www.grnet.gr/">Εθνικό Δίκτυο Έρευνας και Τεχνολογίας</a></p>

</div>

</div>

      <script src="site_media/js/libs/jquery-1.5.1.min.js"></script>

      <script src="site_media/js/libs/jquery.cookie.js"></script>

      <script src="site_media/js/intro-hover.js"></script>

      <script src="site_media/js/main.js"></script>

                        <!--[if lt IE 7 ]>

      <script src="site_media/js/libs/dd_belatedpng.js"></script>

      <script>DD_belatedPNG.fix('img, .png_bg');</script>

      <![endif]-->

</body>

</html>

<!doctype html>

<!--[if lt IE 7 ]> <html lang="en" class="no-js ie6"> <![endif]-->

<!--[if IE 7 ]>    <html lang="en" class="no-js ie7"> <![endif]-->

<!--[if IE 8 ]>    <html lang="en" class="no-js ie8"> <![endif]-->

<!--[if (gte IE 9)|!(IE)]><!--> <html lang="en" class="no-js"> <!--<![endif]-->

<head>

    <meta charset="utf-8">

  <!-- Always force latest IE rendering engine (even in intranet) & Chrome Frame

       Remove this if you use the .htaccess -->

  <meta http-equiv="X-UA-Compatible" content="chrome=1">

  <title>Pithos+</title>

  <meta name="description" content="Pithos+ GRNet Service">

  <meta name="author" content="Kostas Papadimitriou <kpap@grnet.gr>">

  <!--  Mobile viewport optimized: j.mp/bplateviewport -->

  <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1">

    <!-- Place favicon.ico & apple-touch-icon.png

        in the root of your domain and delete these references -->

  <link rel="shortcut icon" href="/favicon.ico">

  <link rel="apple-touch-icon" href="/apple-touch-icon.png">

  <link rel="stylesheet" href="site_media/css/site.css">

  <script src="site_media/js/libs/modernizr-1.7.min.js"></script>

  <script src="https://ajax.googleapis.com/ajax/libs/jquery/1.4.2/jquery.min.js"></script>

  <script>

    var CLOUDBAR_ACTIVE_SERVICE = 'cloud';

    var CLOUDBAR_LOCATION = "/static/im/cloudbar/";

    var CLOUDBAR_SERVICES = "/im/get_services";

    var CLOUDBAR_MENU = "/im/get_menu";

    $(document).ready(function(){

      $.getScript(CLOUDBAR_LOCATION + 'cloudbar.js');

    })

  </script>

</head>

<body id="index">

    <div class="container">

        <div class="logo">

            <a href="#" title="Pithos+"><img 

                src="site_media/images/logo.png" 

                alt="Pithos+" 

                title="Pithos+" /></a>

        </div>

        <div class="inner box-round-mid box-shadow-mid clearfix">

            <div class="cols clearfix">

                <div class="main-content">

    <div class="intro-text page text">

        <p>

        Η υπηρεσία Pithos+ προσφέρει σε κάθε χρήστη <em class="bold">50 GBytes</em> αποθηκευτικού χώρου online, προσβάσιμα από παντού, πάντοτε, με ασφάλεια. Η χρήση είναι <em class="bold">ελεύθερη και δωρεάν</em> για τους φοιτητές και μέλη της ακαδημαϊκής, ερευνητικής και εκπαιδευτικής κοινότητας της Ελλάδας, οι οποίοι μπορούν να αποθηκεύουν τα αρχεία τους και να τα μοιράζονται με άλλους χρήστες ή να τα διαθέτουν στο Διαδίκτυο. Προαιρετικά, τηρείται ιστορικό των αρχείων με δυνατότητα ανάγνωσης παλαιότερων εκδόσεων (versioning).

        </p>

        <!--<p>

        Η χρήση της υπηρεσίας διέπεται από τους όρους χρήσης της.

        </p>-->

    </div>

    <div class="inner-bottom">

        <a class="gotoapp" 

            href="/ui" 

            title="Enter Pithos+">Είσοδος</a>

    </div>

    <div class="downloads clearfix">

        <div class="desc">

        <h4>Λογισμικό</h4>

            <p class="desc">Για την άμεση πρόσβαση και τον συγχρονισμό των αρχείων του υπολογιστή σας με την υπηρεσία, κατεβάστε την εφαρμογή Pithos+ για το λειτουργικό σύστημα που χρησιμοποιείτε:</p>

        </div>

        <div class="downloads-list">

            <div class="download windows">

                <div class="subtitle">Pithos+ για</div>

                <div class="title">Windows</div>

                <div class="compat">XP, Vista, 7</div>

                <div class="link"><a href="http://code.grnet.gr/projects/pithos-ms-client/files">Επιλογή</a></div>

            </div>

            <div class="download osx">

                <div class="subtitle">Pithos+ για</div>

                <div class="title">Mac OS X</div>

                <div class="compat">10.6 ή νεότερο</div>

                <div class="link"><a href="http://code.grnet.gr/projects/pithos-macos/files">Επιλογή</a></div>

            </div>

            <div class="download linux last">

                <div class="subtitle">Pithos+ για</div>

                <div class="title">Linux</div>

                <div class="compat">Πακέτο Python</div>

                <div class="link"><a href="http://code.grnet.gr/projects/pithos-tools/files">Επιλογή</a></div>

            </div>

        </div>

    </div>

</div>

            </div>

        </div>

    </div>

</div>

</div>

<div class="footer">

<div class="bottom-text">

    <p>&copy; 2011 <a target="_blank" href="http://www.grnet.gr/">Εθνικό Δίκτυο Έρευνας και Τεχνολογίας</a></p>

</div>

</div>

      <script src="site_media/js/libs/jquery-1.5.1.min.js"></script>

      <script src="site_media/js/libs/jquery.cookie.js"></script>

      <script src="site_media/js/intro-hover.js"></script>

      <script src="site_media/js/main.js"></script>

                        <!--[if lt IE 7 ]>

      <script src="site_media/js/libs/dd_belatedpng.js"></script>

      <script>DD_belatedPNG.fix('img, .png_bg');</script>

      <![endif]-->

</body>

</html>

html,

body,

div,

span,

applet,

object,

iframe,

h1,

h2,

h3,

h4,

h5,

h6,

p,

blockquote,

pre,

a,

abbr,

acronym,

address,

big,

cite,

code,

del,

dfn,

em,

font,

img,

ins,

kbd,

q,

s,

samp,

small,

strike,

strong,

sub,

sup,

tt,

var,

dl,

dt,

dd,

ol,

ul,

li,

fieldset,

form,

label,

legend,

table,

caption,

tbody,

tfoot,

thead,

tr,

th,

td {

  margin: 0;

  padding: 0;

  outline: 0;

  border: 0;

  vertical-align: baseline;

  font-weight: inherit;

  font-style: inherit;

  font-size: 100%;

  font-family: inherit;

}

body {

  background: #fff;

  color: #000;

  line-height: 1;

}

ol, ul {

  list-style: none;

}

table {

  border-collapse: separate;

  border-spacing: 0;

  vertical-align: middle;

}

caption, th, td {

  vertical-align: middle;

  text-align: left;

  font-weight: normal;

}

q, blockquote {

  quotes: '' '';

}

q:before,

q:after,

blockquote:before,

blockquote:after {

  content: '';

}

a img {

  border: none;

}

/*@import "grnetstyles/css3.less";*/

/* float clearing for IE6 */

* html .clearfix {

  height: 1%;

  overflow: visible;

}

/* float clearing for IE7 */

* + html .clearfix {

  min-height: 1%;

}

/* float clearing for everyone else */

.clearfix:after {

  clear: both;

  content: ".";

  display: block;

  height: 0;

  visibility: hidden;

  font-size: 0;

}

.footer a {

  color: #74AEC9;

  text-decoration: underline;

}

.footer a:hover {

  color: #4085A5;

}

body {

  background-image: url("../images/bg.png");

  background-repeat: repeat-x;

  font-size: 13px;

  font-family: verdana;

  background-position: 0px -90px;

  min-width: 870px;

}

body.alt {

  background-image: url("../images/bg-alt.png");

}

.container {

  width: 870px;

  margin: 0 auto;

  margin-top: 20px;

}

.inner {

  margin-top: 2.5em;

  background-image: url("../images/bg-inner.png");

  width: 100%;

}

.inner .left {

  position: relative;

  width: 180px;

  float: left;

}

.inner .left ul {

  margin-top: 90px;

  color: #4085A5;

  left: -16px;

  padding-top: 40px;

  padding-right: 10px;

}

.inner .left ul li {

  font-size: 1.8em;

  margin-bottom: 0.2em;

  position: relative;

}

.inner .left ul li a.page-link {

  display: block;

  color: inherit;

  text-decoration: none;

  padding: 10px;

  padding-left: 36px;

}

.inner .left ul li a.page-link:hover, .inner .left ul li.selected a.page-link {

  text-shadow: none;

  color: #fff;

  background-color: #74AEC9;

  border-left: 0px solid #92C1D7;

  padding-left: 36px;

}

.inner .left ul li .close-button:hover {

  background-color: #99C9E0;

}

.inner .left ul li .close-button {

  display: block;

  position: absolute;

  left: -30px;

  top: 0px;

  font-size: 0.7em;

  border: none;

  background: transparent;

  padding: 0;

  padding-top: 13px;

  padding-left: 9px;

  margin: 0px;

  text-decoration: none;

  color: #fff;

  width: 21px;

  height: 30px;

  font-weight: bold;

  display: block;

  visibility: hidden;

}

.inner .left ul li.current a.page-link {

  color: #fff;

  background-color: #74AEC9;

  border-left: 30px solid #92C1D7;

  padding-left: 36px;

  margin-left: -30px;

}

.inner .video-cont, .inner .page-cont {

  width: 690px;

  float: right;

}

.inner .cols {

  position: relative;

}

.page {

  display: block;

  top: 0;

}

.page-wrapper {

  position: relative;

}

.page.text {

  margin-left: 27px;

  padding-top: 20px;

  padding-right: 20px;

  padding-bottom: 10px;

}

.page.text h2 {

  font-size: 1.9em;

  color: #4085A5;

  margin-bottom: 1.2em;

}

.page.text h2 em {

  color: #FCFDFE;

}

.page.text a {

  color: #213D4A;

}

.page.text p em {

  color: #4C6A78;

  /*font-weight: bold;*/

}

.page.text h3 {

  font-size: 1.2em;

  color: #4394B9;

  margin-bottom: 0.5em;

  margin-top: 1.5em;

}

.page.text h4 {

  font-weight: bold;

  font-size: 1.1em;

  margin-bottom: 0.3em;

}

.page.text p {

  color: #213D4A;

  font-size: 1.1em;

  margin-bottom: 1em;

  text-align: justify;

  line-height: 1.4em;

}

.inner .video {

  width: 640px;

  height: 360px;

  background-color: #4085A5;

  margin: 20px;

  margin-left: 27px;

  margin-bottom: 20px;

  margin-top: 20px;

  /*border: 1px solid #4085A5;*/

}

.logo {

  text-align: center;

}

.logo img {

  margin-left: 75px;

}

.inner-bottom {

  width: 100%;

}

.inner-bottom .testuser {

  display: none;

  background: #000;

  margin-right: 40px;

  float: right;

  margin-top: 10px;

  margin-bottom: 20px;

}

.gotoapp {

  display: block;

  padding: 0.7em 5em;

  color: #fff;

  font-size: 1.1em;

  background-color: #FF7F2A;

  cursor: pointer;

  margin-right: -20px;

  text-decoration: none;

}

.gotoapp:hover {

  background-color: #FF9955;

}

.page.text {

  margin-right: 20px;

  margin-top: 20px;

}

.inner-bottom.in-page .testuser {

  margin-right: 60px;

}

.banner-coming {

  position: absolute;

  left: 0px;

  top: 0px;

}

.footer {

  text-align: center;

  margin: 0 auto;

  width: 870px;

  margin: 2em auto;

}

.footer .links {

  color: #4085A5;

  margin-bottom: 1em;

}

.footer .links li {

  display: inline;

  margin-right: 1em;

  padding-right: 1em;

  border-right: 1px solid #4085A5;

}

.footer .links li a {

  color: inherit;

  text-decoration: none;

}

.footer .links li.last {

  margin-right: 0;

  padding-right: 0;

  border: none;

}

.footer .bottom-text {

  color: #74AEC9;

}

/*style 2*/

body.style2 .page.text {

  background-color: #7DB3CC;

  padding-left: 20px;

}

body.style2 .page.text p, body.style2 .page.text h2 {

  color: #fff;

}

#video div.vjs-big-play-button {

  background: none !important;

  border: none !important;

  box-shadow: 4px 4px 20px #477589 !important;

}

#video div.vjs-big-play-button:hover {

  background: none !important;

  border: none !important;

  box-shadow: 4px 4px 50px #477589 !important;

  background: #4085A5 !important;

}

body {

  text-align: center;

}

* html body legend {

  margin: -8px 16px 0;

  padding: 0;

}

html > body p code {

  *white-space: normal;

}

.container {

  text-align: left;

}

sup {

  vertical-align: text-top;

}

sub {

  vertical-align: text-bottom;

}

hr {

  margin: -8px auto 11px;

}

img {

  -ms-interpolation-mode: bicubic;

}

fieldset {

  padding-top: 0;

}

textarea {

  overflow: auto;

}

input.text {

  margin: .5em 0;

  border: 1px solid #bbb;

  background-color: #ffffff;

}

input.text:focus {

  border: 1px solid #666666;

}

input.title {

  margin: .5em 0;

  border: 1px solid #bbb;

  background-color: #ffffff;

}

input.title:focus {

  border: 1px solid #666666;

}

input.checkbox {

  position: relative;

  top: 0.25em;

}

input.radio {

  position: relative;

  top: 0.25em;

}

input.button {

  position: relative;

  top: 0.25em;

}

textarea {

  margin: 0.5em 0;

}

select {

  margin: 0.5em 0;

}

button {

  position: relative;

  top: 0.25em;

}

a {

  color: #4085A5;

}

.menu li {

  height: 50px;

}

.inner-bottom .testuser {

  margin-right: 22px;

}

.inner-bottom .testuser a {

  margin-right: 0px;

}

/* Reset.less

 * Props to Eric Meyer (meyerweb.com) for his CSS reset file. We're using an adapted version here	that cuts out some of the reset HTML elements we will never need here (i.e., dfn, samp, etc).

 * ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- */

html, body {

  margin: 0;

  padding: 0;

}

h1,

h2,

h3,

h4,

h5,

h6,

p,

blockquote,

pre,

a,

abbr,

acronym,

address,

cite,

code,

del,

dfn,

em,

img,

q,

s,

samp,

small,

strike,

strong,

sub,

sup,

tt,

var,

dd,

dl,

dt,

li,

ol,

ul,

fieldset,

form,

label,

legend,

button,

table,

caption,

tbody,

tfoot,

thead,

tr,

th,

td {

  margin: 0;

  padding: 0;

  border: 0;

  font-weight: normal;

  font-style: normal;

  font-size: 100%;

  line-height: 1;

  font-family: inherit;

}

table {

  border-collapse: collapse;

  border-spacing: 0;

}

ol, ul {

  list-style: none;

}

q:before,

q:after,

blockquote:before,

blockquote:after {

  content: "";

}

html {

  overflow-y: scroll;

  font-size: 100%;

  -webkit-text-size-adjust: 100%;

  -ms-text-size-adjust: 100%;

}

a:focus {

  outline: thin dotted;

}

a:hover, a:active {

  outline: 0;

}

article,

aside,

details,

figcaption,

figure,

footer,

header,

hgroup,

nav,

section {

  display: block;

}

audio, canvas, video {

  display: inline-block;

  *display: inline;

  *zoom: 1;

}

audio:not([controls]) {

  display: none;

}

sub, sup {