diff --git a/www/css/layout.css b/www/css/layout.css index 75fc678..fa697e6 100644 --- a/www/css/layout.css +++ b/www/css/layout.css @@ -42,6 +42,7 @@ h4{ font-weight:normal; margin-left:20px; padding:10px 0; + position:relative; color:#fff; text-shadow: 2px 2px 2px #050505; } @@ -85,6 +86,7 @@ header .stuts span { .table_dark td { color: #838383; /*color: #CAD4D6;*/ + width: 70% border-bottom: 1px solid #696969; border-right:1px solid #696969; padding: 7px 17px; diff --git a/www/index.py b/www/index.py index f4821f1..6df33e0 100755 --- a/www/index.py +++ b/www/index.py @@ -56,16 +56,16 @@ def getInternalNumbers(): conn = connectDB() c = conn.cursor() order = 'int_number' - result = '

Список внутренних телефонов

' + result = '

Список внутренних телефонов

' qwr = "SELECT * FROM int_number ORDER by " + order c.execute(qwr) listHeader = '\n' \ '\n' \ '\n' \ - '\n' + '\n' result = result + listHeader for row in c.fetchall(): - rowData = "\n" % (row[0], row[1], row[2], row[4], row[3]) + rowData = "\n" % (row[0], row[1], row[2], row[4], row[3], row[3]) result = result + rowData return (result + "
№ п/пТелефонФИООписаниеЭлектро-почта
ОписаниеЭл.почта
%s%s%s%s%s
%s%s%s%s%s
\n") @@ -73,7 +73,7 @@ def getCOline(): conn = connectDB() c = conn.cursor() order = 'ext_co_line' - result = '

Список внешних линий

' + result = '

Список внешних линий

' qwr = "SELECT * FROM ext_co_line ORDER by " + order c.execute(qwr) listHeader = '\n' \ @@ -142,7 +142,7 @@ def ReportData(environ): return (result + "
№ п/п
\n" + qwr) def ErrorMessage(txt): - return ('{}'.format(txt)) + return ('{}'.format(txt)) def connectDB(): c = pymysql.connect(