Accueil Explorer Aide
Connexion
ARN
/
coin
forké depuis FFDN/coin
3
0
Fork 0
Fichiers Pull Requests 0
Parcourir la source

Merge branch 'master' of git.illyse.org:coin

tonton Sieur de la Virlouette il y a 11 ans
Parent
4fb2e0bf44 93d77e8b15
commit
94d459f8d8
12 fichiers modifiés avec 238 ajouts et 9 suppressions
Vue séparée Afficher les stats Diff
  1. 0 0
      coin/resources/__init__.py
  2. 3 0
      coin/resources/admin.py
  3. 20 0
      coin/resources/models.py
  4. 3 0
      coin/resources/tests.py
  5. 3 0
      coin/resources/views.py
  6. 5 1
      coin/settings.py
  7. 43 0
      illyse-si-design/abo.html
  8. 40 0
      illyse-si-design/contact.html
  9. 75 5
      illyse-si-design/css/illyse.css
  10. BIN
      illyse-si-design/img/coinitem.png
  11. 3 3
      illyse-si-design/index.html
  12. 43 0
      illyse-si-design/infos.html

+ 0 - 0
coin/resources/__init__.py
Voir le fichier


+ 3 - 0
coin/resources/admin.py
Voir le fichier 

@@ -0,0 +1,3 @@
 
+from django.contrib import admin
 
+
 
+# Register your models here.

+ 20 - 0
coin/resources/models.py
Voir le fichier 

@@ -0,0 +1,20 @@
 
+# -*- coding: utf-8 -*-
 
+from django.db import models
 
+from netfields import CidrAddressField, NetManager
 
+
 
+
 
+class IPPool(models.Model):
 
+    """Pool of IP addresses (either v4 or v6)."""
 
+    name = models.CharField(max_length=255, blank=False, null=False,
 
+                            verbose_name='Name of the IP pool')
 
+    description = models.TextField(blank=True, null=False,
 
+                                   verbose_name='Description of the IP pool')
 
+    inet = CidrAddressField()
 
+    objects = NetManager()
 
+
 
+
 
+class IPSubnet(models.Model):
 
+    inet = CidrAddressField()
 
+    objects = NetManager()
 
+    ip_pool = models.ForeignKey(IPPool)
 
+    offer_subscription = models.ForeignKey('offers.OfferSubscription')

+ 3 - 0
coin/resources/tests.py
Voir le fichier 

@@ -0,0 +1,3 @@
 
+from django.test import TestCase
 
+
 
+# Create your tests here.

+ 3 - 0
coin/resources/views.py
Voir le fichier 

@@ -0,0 +1,3 @@
 
+from django.shortcuts import render
 
+
 
+# Create your views here.

+ 5 - 1
coin/settings.py
Voir le fichier 

@@ -6,6 +6,9 @@ from django_auth_ldap.config import LDAPSearch, PosixGroupType
 
 
 # Django settings for coin project.
 
 
+# Build paths inside the project like this: os.path.join(BASE_DIR, ...)
 
+BASE_DIR = os.path.dirname(os.path.dirname(__file__))
 
+
 
 PROJECT_PATH = os.path.abspath(os.path.dirname(__file__))
 
 DEBUG = TEMPLATE_DEBUG = False
 
 
@@ -144,7 +147,8 @@ INSTALLED_APPS = (
 
     'autocomplete_light', #Automagic autocomplete foreingkey form component
 
     'coin.members',
 
     'coin.offers',
 
-    'coin.billing'
 
+    'coin.billing',
 
+    'coin.resources'
 
 )
 
 
 # A sample logging configuration. The only tangible logging

+ 43 - 0
illyse-si-design/abo.html
Voir le fichier 

@@ -0,0 +1,43 @@
 
+<!doctype html>
 
+<html class="no-js" lang="en">
 
+  <head>
 
+    <meta charset="utf-8" />
 
+    <meta name="viewport" content="width=device-width, initial-scale=1.0" />
 
+    <title>COIN - Illyse</title>
 
+    <link rel="stylesheet" href="css/foundation.css" />
 
+    <link rel="stylesheet" href="css/illyse.css" />
 
+    <script src="js/vendor/modernizr.js"></script>
 
+  </head>
 
+  <body>
 
+
 
+  <div class="row large-12 columns">
 
+    <h1><a href="index.html">COIN est un Outil pour un Internet Neutre</a></h1>
 
+    <div class="large-3 columns">
 
+      <ul class="side-nav">
 
+          <li><a href="index.html">Tableau de bord</a></li>
 
+          <li><a href="infos.html">Mes informations personnelles</a></li>
 
+          <li class="active">
 
+            <a href="abo.html">Mes abonnements</a>
 
+            <ul><li>ADSL</li>
 
+                <li>VPN</li>
 
+            </ul>
 
+          </li>
 
+          <li><a href="contact.html">Contact / Support</a></li>
 
+      </ul>
 
+  </div>
 
+
 
+  <div class="large-9 columns">
 
+  <!-- Partie à inclure -->
 
+        <div class="row">
 
+            <h2>Mes abonnements</h2>
 
+
 
+        </div>
 
+    </div>
 
+
 
+    <script src="js/vendor/jquery.js"></script>
 
+    <script src="js/foundation.min.js"></script>
 
+    <script>
 
+      $(document).foundation();
 
+    </script>
 
+  </body>
 
+</html>

+ 40 - 0
illyse-si-design/contact.html
Voir le fichier 

@@ -0,0 +1,40 @@
 
+<!doctype html>
 
+<html class="no-js" lang="en">
 
+  <head>
 
+    <meta charset="utf-8" />
 
+    <meta name="viewport" content="width=device-width, initial-scale=1.0" />
 
+    <title>COIN - Illyse</title>
 
+    <link rel="stylesheet" href="css/foundation.css" />
 
+    <link rel="stylesheet" href="css/illyse.css" />
 
+    <script src="js/vendor/modernizr.js"></script>
 
+  </head>
 
+  <body>
 
+
 
+  <div class="row large-12 columns">
 
+    <h1><a href="index.html">COIN est un Outil pour un Internet Neutre</a></h1>
 
+    <div class="large-3 columns">
 
+      <ul class="side-nav">
 
+          <li><a href="index.html">Tableau de bord</a></li>
 
+          <li><a href="infos.html">Mes informations personnelles</a></li>
 
+          <li>
 
+            <a href="abo.html">Mes abonnements</a>
 
+          </li>
 
+          <li class="active"><a href="contact.html">Contact / Support</a></li>
 
+      </ul>
 
+  </div>
 
+
 
+  <div class="large-9 columns">
 
+  <!-- Partie à inclure -->
 
+        <div class="row">
 
+            <h2>Contact / Support</h2>
 
+            <div class="panel">contact [at] illyse  [point] org</div>
 
+        </div>
 
+    </div>
 
+
 
+    <script src="js/vendor/jquery.js"></script>
 
+    <script src="js/foundation.min.js"></script>
 
+    <script>
 
+      $(document).foundation();
 
+    </script>
 
+  </body>
 
+</html>

+ 75 - 5
illyse-si-design/css/illyse.css
Voir le fichier 

@@ -1,25 +1,95 @@
 
 /* Structure */
 
 
 h1 {
 
-	/*border: 2px solid red;*/
 
+	font-size: 2.5em;
 
+	user-select: none;
 
+	position: fixed;
 
+	height: -0.2em;
 
+	width: 100%;
 
+}
 
+div.large-3, div.large-9 {
 
+	margin-top: 7em;
 
+}
 
+h1:before {
 
+	font-size: 1.25em;
 
+	margin-left: 1em;
 
+	margin-right: -1em;
 
+	display: block;
 
+	float: left;
 
+	width: 25%;
 
+}
 
+
 
+/* Navigateurs */
 
+
 
+h1 {
 
+	-moz-user-select: none;
 
+	-webkit-user-select: none;
 
 }
 
 
 /* Contenus */
 
 
 h1:before {
 
-	content: "\\_o< – ";
 
+	content: "\\_o<";
 
 	font-family: monospace;
 
 }
 
 h1:hover:before {
 
-	content: "\\_x< – ";
 
+	content: "\\_x<";
 
+}
 
+h1:hover:after {
 
+	content: "PAN Administre les Ninternetz";
 
+	position: fixed;
 
+	text-align: center;
 
+	right: 15%;
 
+	left: 25%;
 
+}
 
+
 
+h1:hover a {
 
+	opacity: 0.1;
 
+}
 
+
 
+h2:before {
 
+	content: url(../img/coinitem.png);
 
+	margin-right: 0.25em;
 
 }
 
 
 /* Couleurs */
 
 
-h1 {
 
+h1 a, h1:after {
 
 	color: #0086A9;
 
+	font-weight: bold;
 
 }
 
 
-h1:before {	
+h2 {
 
 	color: #FF6600;
 
+	border-bottom: 2px solid #0086A9;
 
+}
 
+
 
+h1:before {
 
+	color: #FF6600;
 
+	font-weight: normal;
 
+}
 
+
 
+.side-nav {
 
+	background-color: #E8E8FF;
 
+	border: 1px solid #E0E0E0;
 
+	padding: 0;
 
+}
 
+
 
+.side-nav li:first-child:before {
 
+	content: "Navigation :";
 
+	font-weight: bold;
 
+	display: block;
 
+	margin-left: 1em;
 
+	margin-bottom: 0.5em;
 
+	text-decoration: underline;
 
+}
 
+
 
+.side-nav a {
 
+	padding: 0 0.5em 0.2em 0.5em;
 
+}
 
+
 
+.side-nav a:hover, .side-nav li.active a {
 
+	background-color: #0086A9;
 
+	color: #FFFFFF !important;
 
+	border-radius: 5px;
 
 }

BIN
illyse-si-design/img/coinitem.png
Voir le fichier


+ 3 - 3
illyse-si-design/index.html
Voir le fichier 

@@ -16,15 +16,15 @@
 
       <ul class="side-nav">
 
           <li class="active"><a href="index.html">Tableau de bord</a></li>
 
           <li><a href="infos.html">Mes informations personnelles</a></li>
 
-          <li><a href="#">Mes abonnements</a></li>
 
-          <li><a href="#">Contact - Support</a></li>
 
+          <li><a href="abo.html">Mes abonnements</a></li>
 
+          <li><a href="contact.html">Contact / Support</a></li>
 
       </ul>
 
   </div>
 
 
   <div class="large-9 columns">
 
   <!-- Partie à inclure -->
 
         <div class="row">
 
-            <h2>Tableau de bord</h2>
 
+            <h2><span>Tableau de bord</span></h2>
 
             <div class="large-6 columns">
 
                 <h3>Alertes</h3>
 
                 <div class="panel">Ici les news de santé des serveurs, etc.</div>

+ 43 - 0
illyse-si-design/infos.html
Voir le fichier 

@@ -0,0 +1,43 @@
 
+<!doctype html>
 
+<html class="no-js" lang="en">
 
+  <head>
 
+    <meta charset="utf-8" />
 
+    <meta name="viewport" content="width=device-width, initial-scale=1.0" />
 
+    <title>COIN - Illyse</title>
 
+    <link rel="stylesheet" href="css/foundation.css" />
 
+    <link rel="stylesheet" href="css/illyse.css" />
 
+    <script src="js/vendor/modernizr.js"></script>
 
+  </head>
 
+  <body>
 
+
 
+  <div class="row large-12 columns">
 
+    <h1><a href="index.html">COIN est un Outil pour un Internet Neutre</a></h1>
 
+    <div class="large-3 columns">
 
+      <ul class="side-nav">
 
+          <li><a href="index.html">Tableau de bord</a></li>
 
+          <li class="active"><a href="infos.html">Mes informations personnelles</a></li>
 
+          <li><a href="abo.html">Mes abonnements</a></li>
 
+          <li><a href="contact.html">Contact / Support</a></li>
 
+      </ul>
 
+  </div>
 
+
 
+  <div class="large-9 columns">
 
+  <!-- Partie à inclure -->
 
+        <div class="row">
 
+            <h2>Mes informations personnelles</h2>
 
+            <strong>John Doe</strong><br/>
 
+            55, rue des canards<br/>
 
+            69000 LYON<br/>
 
+            coin@illyse.org<br/>
 
+            01 01 01 01 01<br/>
 
+            Clé ssh
 
+        </div>
 
+    </div>
 
+
 
+    <script src="js/vendor/jquery.js"></script>
 
+    <script src="js/foundation.min.js"></script>
 
+    <script>
 
+      $(document).foundation();
 
+    </script>
 
+  </body>
 
+</html>