[Customisation Database Commits] r1770 - in /branches/stable: ./ titania/ titania/includes/objects/ titania/includes/overlords/ titania/language/ titania/language/en/ titania/language/en/types/ titania/manage/ titania/styles/ titania/styles/default/template/manage/ titania/styles/prosilver/template/common/
Nathan Guse
exreaction at phpbb.com
Sat Oct 16 02:19:48 BST 2010
Author: exreaction
Date: Sat Oct 16 02:19:48 2010
New Revision: 1770
Log:
Merge to stable
Modified:
branches/stable/ (props changed)
branches/stable/titania/ (props changed)
branches/stable/titania/includes/objects/category.php
branches/stable/titania/includes/overlords/ (props changed)
branches/stable/titania/language/ (props changed)
branches/stable/titania/language/en/manage.php
branches/stable/titania/language/en/types/translation.php
branches/stable/titania/manage/categories.php
branches/stable/titania/styles/ (props changed)
branches/stable/titania/styles/default/template/manage/categories.html
branches/stable/titania/styles/prosilver/template/common/overall_header.html (props changed)
Propchange: branches/stable/
------------------------------------------------------------------------------
*** svn:mergeinfo (original)
--- svn:mergeinfo Sat Oct 16 02:19:48 2010
***************
*** 1 ****
! /trunk:1058,1060,1062-1072,1075-1076,1078,1080-1082,1084-1085,1087-1088,1090,1092-1096,1098,1100-1102,1104-1105,1107,1109-1114,1117,1119,1121,1123-1125,1127-1134,1136,1138,1141,1143-1144,1148-1150,1152-1154,1157,1159-1160,1162-1166,1168-1169,1171-1176,1179,1181,1185,1187-1191,1193-1200,1202-1206,1208,1210-1211,1213,1215,1217,1219,1221,1224,1226-1230,1232-1236,1238-1240,1242-1249,1251-1256,1258,1260-1261,1263-1264,1266,1268-1270,1272-1278,1280,1282-1284,1287,1289-1295,1297-1298,1300,1302,1304-1306,1308-1316,1318,1320-1322,1324-1331,1334-1358,1360-1363,1365-1366,1368,1370,1372,1374,1376-1378,1380,1382-1385,1387-1392,1394-1401,1404-1406,1408-1412,1414,1416-1418,1420,1422-1425,1431,1433,1435,1437-1438,1440,1442,1444-1465,1467,1469,1471-1476,1479,1481-1484,1486-1487,1489-1494,1496-1499,1502-1503,1505-1508,1510,1512,1514,1516,1518-1521,1523-1527,1529-1530,1532,1534,1536-1537,1539,1541-1542,1544,1546,1548,1550,1552,1554,1556-1558,1560-1561,1563-1564,1566,1568,1570,1572,1574-1581,1583,1585-1593,1595,1597-1600,1602,1604,1606,1608,1610,1612-1613,1615,1617-1618,1620,1622-1624,1626,1628-1630,1632-1633,1635-1643,1645-1646,1648-1649,1651-1663,1665,1667-1671,1673,1677,1679,1682-1683,1686,1688-1702,1704-1707,1711,1713-1715,1717-1723,1725-1728,1731,1733-1740,1742,1744-1745,1749,1751-1754,1756,1759,1761,1764,1766
--- 1 ----
! /trunk:1058,1060,1062-1072,1075-1076,1078,1080-1082,1084-1085,1087-1088,1090,1092-1096,1098,1100-1102,1104-1105,1107,1109-1114,1117,1119,1121,1123-1125,1127-1134,1136,1138,1141,1143-1144,1148-1150,1152-1154,1157,1159-1160,1162-1166,1168-1169,1171-1176,1179,1181,1185,1187-1191,1193-1200,1202-1206,1208,1210-1211,1213,1215,1217,1219,1221,1224,1226-1230,1232-1236,1238-1240,1242-1249,1251-1256,1258,1260-1261,1263-1264,1266,1268-1270,1272-1278,1280,1282-1284,1287,1289-1295,1297-1298,1300,1302,1304-1306,1308-1316,1318,1320-1322,1324-1331,1334-1358,1360-1363,1365-1366,1368,1370,1372,1374,1376-1378,1380,1382-1385,1387-1392,1394-1401,1404-1406,1408-1412,1414,1416-1418,1420,1422-1425,1431,1433,1435,1437-1438,1440,1442,1444-1465,1467,1469,1471-1476,1479,1481-1484,1486-1487,1489-1494,1496-1499,1502-1503,1505-1508,1510,1512,1514,1516,1518-1521,1523-1527,1529-1530,1532,1534,1536-1537,1539,1541-1542,1544,1546,1548,1550,1552,1554,1556-1558,1560-1561,1563-1564,1566,1568,1570,1572,1574-1581,1583,1585-1593,1595,1597-1600,1602,1604,1606,1608,1610,1612-1613,1615,1617-1618,1620,1622-1624,1626,1628-1630,1632-1633,1635-1643,1645-1646,1648-1649,1651-1663,1665,1667-1671,1673,1677,1679,1682-1683,1686,1688-1702,1704-1707,1711,1713-1715,1717-1723,1725-1728,1731,1733-1740,1742,1744-1745,1749,1751-1754,1756,1759,1761,1764,1766,1768-1769
Propchange: branches/stable/titania/
------------------------------------------------------------------------------
*** svn:mergeinfo (original)
--- svn:mergeinfo Sat Oct 16 02:19:48 2010
***************
*** 1 ****
! /trunk/titania:1058,1060,1062-1072,1075-1076,1078,1080-1082,1084-1085,1087-1088,1090,1092-1096,1098,1100-1102,1104-1105,1107,1109-1114,1117,1119,1121,1123-1125,1127-1134,1136,1138,1141,1143-1144,1148-1150,1152-1154,1157,1159-1160,1162-1166,1168-1169,1171-1176,1179,1181,1185,1187-1191,1193-1199,1205-1206,1215,1219,1324-1331,1334-1358,1360-1363,1365-1366,1368,1370,1372,1374,1376-1378,1380,1382-1385,1387-1392,1394-1400,1404-1406,1408-1412,1414,1416-1418,1422-1425,1431,1433,1435,1437-1438,1440,1442,1444-1465,1467,1469,1471-1476,1479,1481-1484,1486-1487,1489-1494,1496-1499,1502-1503,1505-1508,1510,1512,1514,1516,1518-1521,1523-1527,1529-1530,1532,1534,1536-1537,1539,1541-1542,1544,1546,1548,1550,1552,1554,1556-1558,1560-1561,1563-1564,1566,1568,1570,1572,1574-1581,1583,1585-1593,1595,1597-1600,1602,1604,1606,1608,1610,1612-1613,1615,1617-1618,1620,1622-1624,1626,1628-1630,1632-1633,1635-1643,1645-1646,1648-1649,1651-1663,1665,1667-1671,1673,1677,1679,1682-1683,1686,1688-1702,1704-1707,1711,1713-1715,1717-1723,1725-1728,1731,1733-1740,1742,1744-1745,1749,1751-1754,1756,1759,1761,1764,1766
--- 1 ----
! /trunk/titania:1058,1060,1062-1072,1075-1076,1078,1080-1082,1084-1085,1087-1088,1090,1092-1096,1098,1100-1102,1104-1105,1107,1109-1114,1117,1119,1121,1123-1125,1127-1134,1136,1138,1141,1143-1144,1148-1150,1152-1154,1157,1159-1160,1162-1166,1168-1169,1171-1176,1179,1181,1185,1187-1191,1193-1199,1205-1206,1215,1219,1324-1331,1334-1358,1360-1363,1365-1366,1368,1370,1372,1374,1376-1378,1380,1382-1385,1387-1392,1394-1400,1404-1406,1408-1412,1414,1416-1418,1422-1425,1431,1433,1435,1437-1438,1440,1442,1444-1465,1467,1469,1471-1476,1479,1481-1484,1486-1487,1489-1494,1496-1499,1502-1503,1505-1508,1510,1512,1514,1516,1518-1521,1523-1527,1529-1530,1532,1534,1536-1537,1539,1541-1542,1544,1546,1548,1550,1552,1554,1556-1558,1560-1561,1563-1564,1566,1568,1570,1572,1574-1581,1583,1585-1593,1595,1597-1600,1602,1604,1606,1608,1610,1612-1613,1615,1617-1618,1620,1622-1624,1626,1628-1630,1632-1633,1635-1643,1645-1646,1648-1649,1651-1663,1665,1667-1671,1673,1677,1679,1682-1683,1686,1688-1702,1704-1707,1711,1713-1715,1717-1723,1725-1728,1731,1733-1740,1742,1744-1745,1749,1751-1754,1756,1759,1761,1764,1766,1768-1769
Modified: branches/stable/titania/includes/objects/category.php
==============================================================================
*** branches/stable/titania/includes/objects/category.php (original)
--- branches/stable/titania/includes/objects/category.php Sat Oct 16 02:19:48 2010
***************
*** 473,479 ****
$url .= $row['category_name_clean'] . '/';
}
! return titania_url::build_url($url) . titania_url::url_replace($this->category_name_clean) . '-' . $this->category_id;
}
/**
--- 473,479 ----
$url .= $row['category_name_clean'] . '/';
}
! return titania_url::build_url($url) . $this->category_name_clean . '-' . $this->category_id;
}
/**
Propchange: branches/stable/titania/includes/overlords/
------------------------------------------------------------------------------
*** svn:mergeinfo (original)
--- svn:mergeinfo Sat Oct 16 02:19:48 2010
***************
*** 1 ****
! /trunk/titania/includes/overlords:1058,1060,1062-1072,1075-1076,1078,1080-1082,1084-1085,1087-1088,1090,1092-1096,1098,1100-1102,1104-1105,1107,1109-1114,1117,1119,1121,1123-1125,1127-1134,1136,1138,1141,1143-1144,1148-1150,1152-1154,1157,1159-1160,1162-1166,1168-1169,1171-1176,1179,1181,1185,1187-1191,1193-1199,1205-1206,1215,1219,1308-1316,1318,1320-1322,1324-1331,1334-1358,1360-1363,1365-1366,1368,1370,1372,1374,1376-1378,1380,1382-1385,1387-1392,1394-1400,1404-1406,1408-1412,1414,1416-1418,1422-1425,1431,1433,1435,1437-1438,1440,1442,1444-1465,1467,1469,1471-1476,1479,1481-1484,1486-1487,1489-1494,1496-1499,1502-1503,1505-1508,1510,1512,1514,1516,1518-1521,1523-1527,1529-1530,1532,1534,1536-1537,1539,1541-1542,1544,1546,1548,1550,1552,1554,1556-1558,1560-1561,1563-1564,1566,1568,1570,1572,1574-1581,1583,1585-1593,1595,1597-1600,1602,1604,1606,1608,1610,1612-1613,1615,1617-1618,1620,1622-1624,1626,1628-1630,1632-1633,1635-1643,1645-1646,1648-1649,1651-1663,1665,1667-1671,1673,1677,1679,1682-1683,1686,1688-1702,1704-1707,1711,1713-1715,1717-1723,1725-1728,1731,1733-1740,1742,1744-1745,1749,1751-1754,1756,1759,1761,1764,1766
--- 1 ----
! /trunk/titania/includes/overlords:1058,1060,1062-1072,1075-1076,1078,1080-1082,1084-1085,1087-1088,1090,1092-1096,1098,1100-1102,1104-1105,1107,1109-1114,1117,1119,1121,1123-1125,1127-1134,1136,1138,1141,1143-1144,1148-1150,1152-1154,1157,1159-1160,1162-1166,1168-1169,1171-1176,1179,1181,1185,1187-1191,1193-1199,1205-1206,1215,1219,1308-1316,1318,1320-1322,1324-1331,1334-1358,1360-1363,1365-1366,1368,1370,1372,1374,1376-1378,1380,1382-1385,1387-1392,1394-1400,1404-1406,1408-1412,1414,1416-1418,1422-1425,1431,1433,1435,1437-1438,1440,1442,1444-1465,1467,1469,1471-1476,1479,1481-1484,1486-1487,1489-1494,1496-1499,1502-1503,1505-1508,1510,1512,1514,1516,1518-1521,1523-1527,1529-1530,1532,1534,1536-1537,1539,1541-1542,1544,1546,1548,1550,1552,1554,1556-1558,1560-1561,1563-1564,1566,1568,1570,1572,1574-1581,1583,1585-1593,1595,1597-1600,1602,1604,1606,1608,1610,1612-1613,1615,1617-1618,1620,1622-1624,1626,1628-1630,1632-1633,1635-1643,1645-1646,1648-1649,1651-1663,1665,1667-1671,1673,1677,1679,1682-1683,1686,1688-1702,1704-1707,1711,1713-1715,1717-1723,1725-1728,1731,1733-1740,1742,1744-1745,1749,1751-1754,1756,1759,1761,1764,1766,1768-1769
Propchange: branches/stable/titania/language/
------------------------------------------------------------------------------
*** svn:mergeinfo (original)
--- svn:mergeinfo Sat Oct 16 02:19:48 2010
***************
*** 1 ****
! /trunk/titania/language:1058,1060,1062-1072,1075-1076,1078,1080-1082,1084-1085,1087-1088,1090,1092-1096,1098,1100-1102,1104-1105,1107,1109-1114,1117,1119,1121,1123-1125,1127-1134,1136,1138,1141,1143-1144,1148-1150,1152-1154,1157,1159-1160,1162-1166,1168-1169,1171-1176,1179,1181,1185,1187-1191,1193-1199,1205-1206,1215,1219,1324-1331,1334-1358,1360-1363,1365-1366,1368,1370,1372,1374,1376-1378,1380,1382-1385,1387-1392,1394-1400,1404-1406,1408-1412,1414,1416-1418,1422-1425,1431,1433,1435,1437-1438,1440,1442,1444-1465,1467,1469,1471-1476,1479,1481-1484,1486-1487,1489-1494,1496-1499,1502-1503,1505-1508,1510,1512,1514,1516,1523-1527,1529-1530,1532,1534,1536-1537,1539,1541-1542,1544,1546,1548,1550,1552,1554,1556-1558,1560-1561,1563-1564,1566,1568,1570,1572,1574-1581,1583,1585-1593,1595,1597-1600,1602,1604,1606,1608,1610,1612-1613,1615,1617-1618,1620,1622-1624,1626,1628-1630,1632-1633,1635-1643,1645-1646,1648-1649,1651-1663,1665,1667-1671,1673,1677,1679,1682-1683,1686,1688-1702,1704-1707,1711,1713-1715,1717-1723,1725-1728,1731,1733-1740,1742,1744-1745,1749,1751-1754,1756,1759,1761,1764,1766
--- 1 ----
! /trunk/titania/language:1058,1060,1062-1072,1075-1076,1078,1080-1082,1084-1085,1087-1088,1090,1092-1096,1098,1100-1102,1104-1105,1107,1109-1114,1117,1119,1121,1123-1125,1127-1134,1136,1138,1141,1143-1144,1148-1150,1152-1154,1157,1159-1160,1162-1166,1168-1169,1171-1176,1179,1181,1185,1187-1191,1193-1199,1205-1206,1215,1219,1324-1331,1334-1358,1360-1363,1365-1366,1368,1370,1372,1374,1376-1378,1380,1382-1385,1387-1392,1394-1400,1404-1406,1408-1412,1414,1416-1418,1422-1425,1431,1433,1435,1437-1438,1440,1442,1444-1465,1467,1469,1471-1476,1479,1481-1484,1486-1487,1489-1494,1496-1499,1502-1503,1505-1508,1510,1512,1514,1516,1523-1527,1529-1530,1532,1534,1536-1537,1539,1541-1542,1544,1546,1548,1550,1552,1554,1556-1558,1560-1561,1563-1564,1566,1568,1570,1572,1574-1581,1583,1585-1593,1595,1597-1600,1602,1604,1606,1608,1610,1612-1613,1615,1617-1618,1620,1622-1624,1626,1628-1630,1632-1633,1635-1643,1645-1646,1648-1649,1651-1663,1665,1667-1671,1673,1677,1679,1682-1683,1686,1688-1702,1704-1707,1711,1713-1715,1717-1723,1725-1728,1731,1733-1740,1742,1744-1745,1749,1751-1754,1756,1759,1761,1764,1766,1768-1769
Modified: branches/stable/titania/language/en/manage.php
==============================================================================
*** branches/stable/titania/language/en/manage.php (original)
--- branches/stable/titania/language/en/manage.php Sat Oct 16 02:19:48 2010
***************
*** 41,46 ****
--- 41,47 ----
'APPROVE_QUEUE_CONFIRM' => 'Are you sure you want to <strong>approve</strong> this item?',
'ATTENTION' => 'Attention',
+ 'CATEGORY_NAME_CLEAN' => 'Category URL',
'CHANGE_STATUS' => 'Change Status/Move',
'CLOSED_ITEMS' => 'Closed Items',
Modified: branches/stable/titania/language/en/types/translation.php
==============================================================================
*** branches/stable/titania/language/en/types/translation.php (original)
--- branches/stable/titania/language/en/types/translation.php Sat Oct 16 02:19:48 2010
***************
*** 38,45 ****
//
$lang = array_merge($lang, array(
'TRANSLATION' => 'Translation',
- 'TRANSLATION' => 'Translations',
'TRANSLATION_VALIDATION' => '[phpBB Translation-Validation] %1$s %2$s',
'TRANSLATION_VALIDATION_MESSAGE_APPROVE' => 'Thank you for submitting your Translation to the phpBB.com Customisation Database. After careful inspection your translation has been approved and released into our Customisation Database.
--- 38,51 ----
//
$lang = array_merge($lang, array(
+ 'COULD_NOT_FIND_TRANSLATION_ROOT' => 'We couldn\'t locate the root directory of your language pack. Make sure you have a directory containing <code>language/</code> and optionally <code>styles/</code> in the top level.',
+
+ 'MISSING_FILE' => 'The file <code>%s</code> is missing in your language pack',
+ 'MISSING_KEYS' => 'You are missing the following language keys in <code>%1$s</code>:<br />%2$s',
+
+ 'PASSED_VALIDATION' => 'Your language pack has passed the validation process which checks for missing keys, license files and which repackages your translation, please continue.',
+
'TRANSLATION' => 'Translation',
'TRANSLATION_VALIDATION' => '[phpBB Translation-Validation] %1$s %2$s',
'TRANSLATION_VALIDATION_MESSAGE_APPROVE' => 'Thank you for submitting your Translation to the phpBB.com Customisation Database. After careful inspection your translation has been approved and released into our Customisation Database.
***************
*** 68,78 ****
Thank you,
phpBB Teams',
-
- 'COULD_NOT_FIND_TRANSLATION_ROOT' => 'We couldn\'t locate the root directory of your language pack. Make sure you have a directory containing <code>language/</code> and optionally <code>styles/</code> in the top level.',
-
- 'MISSING_FILE' => 'The file <code>%s</code> is missing in your language pack',
- 'MISSING_KEYS' => 'You are missing the following language keys in <code>%1$s</code>:<br />%2$s',
-
- 'PASSED_VALIDATION' => 'Your language pack has passed the validation process which checks for missing keys, license files and which repackages your translation, please continue.',
));
--- 74,77 ----
Modified: branches/stable/titania/manage/categories.php
==============================================================================
*** branches/stable/titania/manage/categories.php (original)
--- branches/stable/titania/manage/categories.php Sat Oct 16 02:19:48 2010
***************
*** 75,87 ****
$category_object->category_id = ($action == 'edit') ? $category_id : '';
$category_name = utf8_normalize_nfc(request_var('category_name', '', true));
$category_object->category_name = ($category_name == $old_category_name_lang) ? $old_category_name : $category_name;
! $category_object->category_name_clean = (isset(phpbb::$user->lang[$category_object->category_name])) ? $old_category_name_clean : utf8_clean_string($category_object->category_name);
$category_object->parent_id = request_var('category_parent', 0);
$category_object->category_visible = request_var('category_visible', 1);
$category_object->category_type = request_var('category_type', 0);
// Check for errors
! if (!$category_object->category_name)
{
$error[] = phpbb::$user->lang['NO_CATEGORY_NAME'];
}
--- 75,87 ----
$category_object->category_id = ($action == 'edit') ? $category_id : '';
$category_name = utf8_normalize_nfc(request_var('category_name', '', true));
$category_object->category_name = ($category_name == $old_category_name_lang) ? $old_category_name : $category_name;
! $category_object->category_name_clean = utf8_normalize_nfc(request_var('category_name_clean', '', true));
$category_object->parent_id = request_var('category_parent', 0);
$category_object->category_visible = request_var('category_visible', 1);
$category_object->category_type = request_var('category_type', 0);
// Check for errors
! if (!$category_object->category_name || !$category_object->category_name_clean)
{
$error[] = phpbb::$user->lang['NO_CATEGORY_NAME'];
}
***************
*** 179,184 ****
--- 179,185 ----
'ERROR_MSG' => (sizeof($error)) ? implode('<br />', $error) : '',
'CATEGORY' => $category_id,
'CATEGORY_NAME' => (isset(phpbb::$user->lang[$category_object->category_name])) ? phpbb::$user->lang[$category_object->category_name] : $category_object->category_name,
+ 'CATEGORY_NAME_CLEAN' => $category_object->category_name_clean,
'CATEGORY_VISIBLE' => $category_object->category_visible,
'SECTION_NAME' => ($action == 'add') ? phpbb::$user->lang['CREATE_CATEGORY'] : phpbb::$user->lang['EDIT_CATEGORY'] . ' - ' . ((isset(phpbb::$user->lang[$old_category_name])) ? phpbb::$user->lang[$old_category_name] : $old_category_name),
Propchange: branches/stable/titania/styles/
------------------------------------------------------------------------------
*** svn:mergeinfo (original)
--- svn:mergeinfo Sat Oct 16 02:19:48 2010
***************
*** 1,2 ****
/trunk/titania:1349
! /trunk/titania/styles:1058,1060,1062-1072,1075-1076,1078,1080-1082,1084-1085,1087-1088,1090,1092-1096,1098,1100-1102,1104-1105,1107,1109-1114,1117,1119,1121,1123-1125,1127-1134,1136,1138,1141,1143-1144,1148-1150,1152-1154,1157,1159-1160,1162-1166,1168-1169,1171-1176,1179,1181,1185,1187-1191,1193-1199,1205-1206,1215,1219,1324-1331,1334-1358,1360-1363,1365-1366,1368,1370,1372,1374,1376-1378,1380,1382-1385,1387-1392,1394-1400,1404-1406,1408-1412,1414,1416-1418,1422-1425,1431,1433,1435,1437-1438,1440,1442,1444-1465,1467,1469,1471-1476,1479,1481-1484,1486-1487,1489-1494,1496-1499,1502-1503,1505-1508,1510,1512,1514,1516,1518-1521,1523-1527,1529-1530,1532,1534,1536-1537,1539,1541-1542,1544,1546,1548,1550,1552,1554,1556-1558,1560-1561,1563-1564,1566,1568,1570,1572,1574-1581,1583,1585-1593,1595,1597-1600,1602,1604,1606,1608,1610,1612-1613,1615,1617-1618,1620,1622-1624,1626,1628-1630,1632-1633,1635-1643,1645-1646,1648-1649,1651-1663,1665,1667-1671,1673,1677,1679,1682-1683,1686,1688-1702,1704-1707,1711,1713-1715,1717-1723,1725-1728,1731,1733-1740,1742,1744-1745,1749,1751-1754,1756,1759,1761,1764,1766
--- 1,2 ----
/trunk/titania:1349
! /trunk/titania/styles:1058,1060,1062-1072,1075-1076,1078,1080-1082,1084-1085,1087-1088,1090,1092-1096,1098,1100-1102,1104-1105,1107,1109-1114,1117,1119,1121,1123-1125,1127-1134,1136,1138,1141,1143-1144,1148-1150,1152-1154,1157,1159-1160,1162-1166,1168-1169,1171-1176,1179,1181,1185,1187-1191,1193-1199,1205-1206,1215,1219,1324-1331,1334-1358,1360-1363,1365-1366,1368,1370,1372,1374,1376-1378,1380,1382-1385,1387-1392,1394-1400,1404-1406,1408-1412,1414,1416-1418,1422-1425,1431,1433,1435,1437-1438,1440,1442,1444-1465,1467,1469,1471-1476,1479,1481-1484,1486-1487,1489-1494,1496-1499,1502-1503,1505-1508,1510,1512,1514,1516,1518-1521,1523-1527,1529-1530,1532,1534,1536-1537,1539,1541-1542,1544,1546,1548,1550,1552,1554,1556-1558,1560-1561,1563-1564,1566,1568,1570,1572,1574-1581,1583,1585-1593,1595,1597-1600,1602,1604,1606,1608,1610,1612-1613,1615,1617-1618,1620,1622-1624,1626,1628-1630,1632-1633,1635-1643,1645-1646,1648-1649,1651-1663,1665,1667-1671,1673,1677,1679,1682-1683,1686,1688-1702,1704-1707,1711,1713-1715,1717-1723,1725-1728,1731,1733-1740,1742,1744-1745,1749,1751-1754,1756,1759,1761,1764,1766,1768-1769
Modified: branches/stable/titania/styles/default/template/manage/categories.html
==============================================================================
*** branches/stable/titania/styles/default/template/manage/categories.html (original)
--- branches/stable/titania/styles/default/template/manage/categories.html Sat Oct 16 02:19:48 2010
***************
*** 5,19 ****
<form name="postform" method="post" action="{U_ACTION}">
<div class="panel" id="addcategory">
<div class="inner"><span class="corners-top"><span></span></span>
!
<h3>{L_CATEGORY_INFORMATION}</h3>
!
<fieldset>
<dl>
<dt><label for="category_name">{L_CATEGORY_NAME}:</label></dt>
<dd><input type="text" name="category_name" id="category_name" size="45" maxlength="60" value="{CATEGORY_NAME}" class="inputbox autowidth" /></dd>
</dl>
<dl>
<dt><label for="category_parent">{L_PARENT_CATEGORY}:</label></dt>
<dd><label><select name="category_parent" id="category_parent">
<option value="0">-- {L_ROOT} --</option>
--- 5,23 ----
<form name="postform" method="post" action="{U_ACTION}">
<div class="panel" id="addcategory">
<div class="inner"><span class="corners-top"><span></span></span>
!
<h3>{L_CATEGORY_INFORMATION}</h3>
!
<fieldset>
<dl>
<dt><label for="category_name">{L_CATEGORY_NAME}:</label></dt>
<dd><input type="text" name="category_name" id="category_name" size="45" maxlength="60" value="{CATEGORY_NAME}" class="inputbox autowidth" /></dd>
</dl>
<dl>
+ <dt><label for="category_name">{L_CATEGORY_NAME_CLEAN}:</label></dt>
+ <dd><input type="text" name="category_name_clean" id="category_name_clean" size="45" maxlength="60" value="{CATEGORY_NAME_CLEAN}" class="inputbox autowidth" /></dd>
+ </dl>
+ <dl>
<dt><label for="category_parent">{L_PARENT_CATEGORY}:</label></dt>
<dd><label><select name="category_parent" id="category_parent">
<option value="0">-- {L_ROOT} --</option>
***************
*** 43,49 ****
</dl>
</fieldset>
<!-- INCLUDE posting/posting_basic_editor.html -->
!
<span class="corners-bottom"><span></span></span></div>
</div>
<div class="panel bg2">
--- 47,53 ----
</dl>
</fieldset>
<!-- INCLUDE posting/posting_basic_editor.html -->
!
<span class="corners-bottom"><span></span></span></div>
</div>
<div class="panel bg2">
Propchange: branches/stable/titania/styles/prosilver/template/common/overall_header.html
------------------------------------------------------------------------------
*** svn:mergeinfo (original)
--- svn:mergeinfo Sat Oct 16 02:19:48 2010
***************
*** 1 ****
! /trunk/titania/styles/prosilver/template/common/overall_header.html:1200,1202-1204,1208,1210-1211,1213,1217,1219,1221,1224,1226-1230,1232-1236,1238-1240,1242-1249,1251-1256,1258,1260-1261,1263-1264,1266,1268-1270,1272-1278,1280,1282-1284,1287,1289-1295,1297-1298,1300,1302,1304-1306,1308-1316,1318,1320-1322,1324-1331,1334-1358,1360-1363,1365-1366,1368,1370,1372,1374,1376-1378,1380,1382-1385,1387-1392,1394-1400,1404-1406,1408-1412,1414,1416-1418,1420,1422-1425,1431,1433,1435,1437-1438,1440,1442,1444-1465,1467,1469,1471-1476,1479,1481-1484,1486-1487,1489-1494,1496-1499,1502-1503,1505-1508,1510,1512,1514,1516,1518-1521,1523-1527,1529-1530,1532,1534,1536-1537,1539,1541-1542,1544,1546,1548,1550,1552,1554,1556-1558,1560-1561,1563-1564,1566,1568,1570,1572,1574-1581,1583,1585-1593,1595,1597-1600,1602,1604,1606,1608,1610,1612-1613,1615,1617-1618,1620,1622-1624,1626,1628-1630,1632-1633,1635-1643,1645-1646,1648-1649,1651-1663,1665,1667-1671,1673,1677,1679,1682-1683,1686,1688-1702,1704-1707,1711,1713-1715,1717-1723,1725-1728,1731,1733-1740,1742,1744-1745,1749,1751-1754,1756,1759,1761,1764,1766
--- 1 ----
! /trunk/titania/styles/prosilver/template/common/overall_header.html:1200,1202-1204,1208,1210-1211,1213,1217,1219,1221,1224,1226-1230,1232-1236,1238-1240,1242-1249,1251-1256,1258,1260-1261,1263-1264,1266,1268-1270,1272-1278,1280,1282-1284,1287,1289-1295,1297-1298,1300,1302,1304-1306,1308-1316,1318,1320-1322,1324-1331,1334-1358,1360-1363,1365-1366,1368,1370,1372,1374,1376-1378,1380,1382-1385,1387-1392,1394-1400,1404-1406,1408-1412,1414,1416-1418,1420,1422-1425,1431,1433,1435,1437-1438,1440,1442,1444-1465,1467,1469,1471-1476,1479,1481-1484,1486-1487,1489-1494,1496-1499,1502-1503,1505-1508,1510,1512,1514,1516,1518-1521,1523-1527,1529-1530,1532,1534,1536-1537,1539,1541-1542,1544,1546,1548,1550,1552,1554,1556-1558,1560-1561,1563-1564,1566,1568,1570,1572,1574-1581,1583,1585-1593,1595,1597-1600,1602,1604,1606,1608,1610,1612-1613,1615,1617-1618,1620,1622-1624,1626,1628-1630,1632-1633,1635-1643,1645-1646,1648-1649,1651-1663,1665,1667-1671,1673,1677,1679,1682-1683,1686,1688-1702,1704-1707,1711,1713-1715,1717-1723,1725-1728,1731,1733-1740,1742,1744-1745,1749,1751-1754,1756,1759,1761,1764,1766,1768-1769
More information about the customisationdb-commits
mailing list